Conflict resolution.
This commit is contained in:
commit
005e66fbb9
182 changed files with 7944 additions and 2562 deletions
BIN
app/src/main/res/drawable-xhdpi/ic_add.png
Normal file
BIN
app/src/main/res/drawable-xhdpi/ic_add.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 197 B |
BIN
app/src/main/res/drawable-xhdpi/ic_arrow_down_white.png
Normal file
BIN
app/src/main/res/drawable-xhdpi/ic_arrow_down_white.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 425 B |
BIN
app/src/main/res/drawable-xhdpi/ic_arrow_up_white.png
Normal file
BIN
app/src/main/res/drawable-xhdpi/ic_arrow_up_white.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 415 B |
BIN
app/src/main/res/drawable-xhdpi/ic_remove.png
Normal file
BIN
app/src/main/res/drawable-xhdpi/ic_remove.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 380 B |
Loading…
Add table
Add a link
Reference in a new issue