Conflict resolution.

Browse source

...

This commit is contained in:

krtkush 2018-12-28 18:07:54 +05:30

parent 9b2d11b362 76dd9ddc84

commit 0367c515f3

77 changed files with 8269 additions and 2352 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

app/src/main/res/drawable-hdpi/grid.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3 KiB After Width:  |  Height:  |  Size: 3.3 KiB

BIN

app/src/main/res/drawable-hdpi/list.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB