Fix: Resolve merge conflict with master

Browse Source

...

This commit is contained in:

nEEtdo0d

2020-11-01 10:47:17 -05:00

parent b88d9b85cc 5e2c3967fd

commit 420c0feded

11 changed files with 546 additions and 286 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/reward/COMMISSION_DAILY.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.3 KiB After Width:  |  Height:  |  Size: 5.3 KiB

BIN

assets/tw/reward/COMMISSION_URGENT.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.3 KiB After Width:  |  Height:  |  Size: 5.5 KiB

BIN

assets/tw/ui/DORM_INFO.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 11 KiB After Width:  |  Height:  |  Size: 6.6 KiB