Fix: Resolve merge conflict

Browse Source

...

This commit is contained in:

nEEtdo0d

2021-01-16 09:56:52 -05:00

parent 44442c5876 d916c9910a

commit 918eddb740

3 changed files with 4 additions and 4 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

0

assets/cn/handler/GUILD_POPUP_CANCAL.png → assets/cn/handler/GUILD_POPUP_CANCEL.png

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