Fix: Resolve merge conflict

Browse Source

Merge remote-tracking branch 'origin/master' into guild_reward

# Conflicts:
#	module/guild/assets.py

...

This commit is contained in:

nEEtdo0d

2021-01-06 10:07:48 -05:00

parent 4d112c2e2f 90738eb30f

commit a0ec978954

3 changed files with 2 additions and 2 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/jp/campaign/SWITCH_2_EX.png

Binary file not shown.

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

BIN

assets/jp/campaign/SWITCH_2_HARD.png

Binary file not shown.

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