fix Conflict merge

Browse source

...

This commit is contained in:

miggaze 2021-11-10 15:46:37 +07:00

parent 7b8d71b08a 3a084728ea

commit cea1107abf

60 changed files with 4728 additions and 183 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

image/topping2/bd_add_shot.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

image/topping2/bd_add_shot2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

image/topping2/bd_blended.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

image/topping2/bd_lid.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 631 B After Width:  |  Height:  |  Size: 593 B

BIN

image/topping2/bd_straw.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 737 B After Width:  |  Height:  |  Size: 773 B

BIN

image/topping2/blender_icon.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.3 KiB

BIN

image/topping2/cb_checkdis.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 537 B

BIN

image/topping2/cb_disable.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 841 B

BIN

image/topping2/cb_disable_alway.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 841 B

BIN

image/topping2/cb_force_checked.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

image/topping2/text20.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.8 KiB

BIN

image/topping2/text21.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

image/topping2/text4.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

image/topping2/text5.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

image/topping2/text7.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

image/topping2_en/bd_lid.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 631 B After Width:  |  Height:  |  Size: 593 B

BIN

image/topping2_en/bd_straw.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 738 B After Width:  |  Height:  |  Size: 779 B

BIN

image/topping2_en/cb_checkdis.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 537 B

BIN

image/topping2_en/cb_checked.png

View file

Binary file not shown.

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

BIN

image/topping2_en/cb_force_checked.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

image/topping2_en/cb_notcheck.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 655 B After Width:  |  Height:  |  Size: 655 B

BIN

image/topping2_en/text20.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

image/topping2_en/text21.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2 KiB

BIN

image/topping2_en/text4.png Normal file

View file

Binary file not shown.

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

BIN

image/topping2_en/text5.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.1 KiB

BIN

image/topping2_en/text7.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 6.3 KiB

BIN

image/vending_error/img1.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 54 KiB

BIN

image/vending_error/text1.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 19 KiB

BIN

image/vending_error/text2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 21 KiB

BIN

image/vending_error_en/img1.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 54 KiB

BIN

image/vending_error_en/text1.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 22 KiB

BIN

image/vending_error_en/text2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 21 KiB