fix merge conflict

Browse source

...

This commit is contained in:

Christian Schabesberger 2019-01-23 16:12:21 +01:00

parent 2eb75d6c18 e7a0dc62c5

commit 9269dcc984

38 changed files with 353 additions and 3 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/ic_newpipe_update.png Executable file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 680 B

BIN

app/src/main/res/drawable-hdpi/ic_settings_update_black.png Executable file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 720 B

BIN

app/src/main/res/drawable-hdpi/ic_settings_update_white.png Executable file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 720 B