Fix: merge conflict reward/assets.py

Browse Source

...

This commit is contained in:

nEEtdo0d

2021-07-22 18:41:57 -04:00

parent b77135b9d6 5564c3e88f

commit 9cb12f8a36

15 changed files with 143 additions and 80 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

assets/tw/daemon/AMBUSH_AVOID.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 10 KiB After Width:  |  Height:  |  Size: 26 KiB

BIN

assets/tw/handler/MAP_AMBUSH_ATTACK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.5 KiB After Width:  |  Height:  |  Size: 26 KiB

BIN

assets/tw/ui/DORM_FEED_CANCEL.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.2 KiB After Width:  |  Height:  |  Size: 21 KiB