Fix: Resolve merge conflict, buttons() to buttons

Browse Source

...

This commit is contained in:

nEEtdo0d

2021-08-05 23:24:42 -04:00

parent 9b6a997de4 060bae3d18

commit 10c14e2160

15 changed files with 31 additions and 31 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/build/BUILD_FINISH_ORDERS.png → assets/cn/gacha/BUILD_FINISH_ORDERS.png

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

0

assets/cn/build/BUILD_SUBMIT_ORDERS.png → assets/cn/gacha/BUILD_SUBMIT_ORDERS.png

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

0

assets/cn/build/SHOP_MEDAL_CHECK.png → assets/cn/gacha/SHOP_MEDAL_CHECK.png

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

0

assets/en/build/BUILD_FINISH_ORDERS.png → assets/en/gacha/BUILD_FINISH_ORDERS.png

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

0

assets/en/build/BUILD_SUBMIT_ORDERS.png → assets/en/gacha/BUILD_SUBMIT_ORDERS.png

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

0

assets/en/build/SHOP_MEDAL_CHECK.png → assets/en/gacha/SHOP_MEDAL_CHECK.png

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

0

assets/jp/build/BUILD_FINISH_ORDERS.png → assets/jp/gacha/BUILD_FINISH_ORDERS.png

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

0

assets/jp/build/BUILD_SUBMIT_ORDERS.png → assets/jp/gacha/BUILD_SUBMIT_ORDERS.png

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

0

assets/jp/build/SHOP_MEDAL_CHECK.png → assets/jp/gacha/SHOP_MEDAL_CHECK.png

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

0

assets/tw/build/BUILD_FINISH_ORDERS.png → assets/tw/gacha/BUILD_FINISH_ORDERS.png

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

0

assets/tw/build/BUILD_SUBMIT_ORDERS.png → assets/tw/gacha/BUILD_SUBMIT_ORDERS.png

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

0

assets/tw/build/SHOP_MEDAL_CHECK.png → assets/tw/gacha/SHOP_MEDAL_CHECK.png

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