Fix: resolve merge conflicts

Browse Source

...

This commit is contained in:

nEEtdo0d

2022-02-13 14:41:30 -05:00

parent 5a33ba5c37 9266f3b3fc

commit cca678903a

109 changed files with 4942 additions and 3154 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/cn/campaign/OCR_EVENT_PT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.4 KiB

BIN

assets/cn/meta_reward/META_REWARD_NOTICE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.4 KiB

BIN

assets/cn/meta_reward/REWARD_CHECK.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.4 KiB

BIN

assets/cn/meta_reward/REWARD_ENTER.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.2 KiB

BIN

assets/cn/meta_reward/REWARD_RECEIVE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.5 KiB

BIN

assets/cn/template/TEMPLATE_SIREN_BBlightning.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

BIN

assets/cn/template/TEMPLATE_SIREN_CAlightning.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.4 KiB

BIN

assets/cn/template/TEMPLATE_SIREN_CVlightning.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.0 KiB

BIN

assets/cn/ui/RESHMENU_GOTO_META.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB

BIN

assets/cn/war_archives/TEMPLATE_EMPYREAL_TRAGICOMEDY.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 17 KiB

BIN

assets/en/campaign/OCR_EVENT_PT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.9 KiB

BIN

assets/en/template/TEMPLATE_SIREN_BBlightning.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

BIN

assets/en/template/TEMPLATE_SIREN_CAlightning.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.4 KiB

BIN

assets/en/template/TEMPLATE_SIREN_CVlightning.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.0 KiB

BIN

assets/jp/campaign/OCR_EVENT_PT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.4 KiB

BIN

assets/jp/template/TEMPLATE_SIREN_BBlightning.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

BIN

assets/jp/template/TEMPLATE_SIREN_CAlightning.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.4 KiB

BIN

assets/jp/template/TEMPLATE_SIREN_CVlightning.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.0 KiB

BIN

assets/tw/campaign/OCR_EVENT_PT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.4 KiB

BIN

assets/tw/guild/BATTLE_STATUS_CF.png

Binary file not shown.

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

BIN

assets/tw/guild/EXP_INFO_CF.png

Binary file not shown.

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

BIN

assets/tw/os_ash/BEACON_ENTER.png

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_BBlightning.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

BIN

assets/tw/template/TEMPLATE_SIREN_CAlightning.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.4 KiB

BIN

assets/tw/template/TEMPLATE_SIREN_CVlightning.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.0 KiB