Merge

2024-12-03 14:45:47 +07:00 · 2024-12-03 14:45:47 +07:00 · 09546a6b0c
commit 09546a6b0c
parent de8bcfc291 7270d1b977
49 changed files with 11 additions and 0 deletions
--- a/image/page_drink_disable_n2/bn_Almost_Umeshu.png
+++ b/image/page_drink_disable_n2/bn_Almost_Umeshu.png
--- a/image/page_drink_disable_n2/bn_Beachy_Mint.png
+++ b/image/page_drink_disable_n2/bn_Beachy_Mint.png
--- a/image/page_drink_disable_n2/bn_Black_Menthe.png
+++ b/image/page_drink_disable_n2/bn_Black_Menthe.png
--- a/image/page_drink_disable_n2/bn_Cafe_Avec_Liqueur.png
+++ b/image/page_drink_disable_n2/bn_Cafe_Avec_Liqueur.png
--- a/image/page_drink_disable_n2/bn_Espresso_Martini.png
+++ b/image/page_drink_disable_n2/bn_Espresso_Martini.png
--- a/image/page_drink_disable_n2/bn_Neon_Spark.png
+++ b/image/page_drink_disable_n2/bn_Neon_Spark.png
--- a/image/page_drink_disable_n2/bn_Russian_Mojito.png
+++ b/image/page_drink_disable_n2/bn_Russian_Mojito.png
--- a/image/page_drink_disable_n2/bn_Strawberry_Martini.png
+++ b/image/page_drink_disable_n2/bn_Strawberry_Martini.png
--- a/image/page_drink_disable_n2/bn_Summer_Chill.png
+++ b/image/page_drink_disable_n2/bn_Summer_Chill.png
--- a/image/page_drink_disable_n2/bn_Wakeup_Call.png
+++ b/image/page_drink_disable_n2/bn_Wakeup_Call.png
--- a/image/page_drink_disable_n2/bn_Yuzu_Highball.png
+++ b/image/page_drink_disable_n2/bn_Yuzu_Highball.png
--- a/image/page_drink_disable_n2/bn_Yuzu_Martini.png
+++ b/image/page_drink_disable_n2/bn_Yuzu_Martini.png
--- a/image/page_drink_n/bn_Almost_Umeshu.png
+++ b/image/page_drink_n/bn_Almost_Umeshu.png
--- a/image/page_drink_n/bn_Beachy_Mint.png
+++ b/image/page_drink_n/bn_Beachy_Mint.png
--- a/image/page_drink_n/bn_Black_Menthe.png
+++ b/image/page_drink_n/bn_Black_Menthe.png
--- a/image/page_drink_n/bn_Cafe_Avec_Liqueur.png
+++ b/image/page_drink_n/bn_Cafe_Avec_Liqueur.png
--- a/image/page_drink_n/bn_Espresso_Martini.png
+++ b/image/page_drink_n/bn_Espresso_Martini.png
--- a/image/page_drink_n/bn_Neon_Spark.png
+++ b/image/page_drink_n/bn_Neon_Spark.png
--- a/image/page_drink_n/bn_Russian_Mojito.png
+++ b/image/page_drink_n/bn_Russian_Mojito.png
--- a/image/page_drink_n/bn_Strawberry_Martini.png
+++ b/image/page_drink_n/bn_Strawberry_Martini.png
--- a/image/page_drink_n/bn_Summer_Chill.png
+++ b/image/page_drink_n/bn_Summer_Chill.png
--- a/image/page_drink_n/bn_Wakeup_Call.png
+++ b/image/page_drink_n/bn_Wakeup_Call.png
--- a/image/page_drink_n/bn_Yuzu_Highball.png
+++ b/image/page_drink_n/bn_Yuzu_Highball.png
--- a/image/page_drink_n/bn_Yuzu_Martini.png
+++ b/image/page_drink_n/bn_Yuzu_Martini.png
--- a/image/page_drink_picture2_n/bn_Almost_Umeshu.png
+++ b/image/page_drink_picture2_n/bn_Almost_Umeshu.png
--- a/image/page_drink_picture2_n/bn_Beachy_Mint.png
+++ b/image/page_drink_picture2_n/bn_Beachy_Mint.png
--- a/image/page_drink_picture2_n/bn_Black_Menthe.png
+++ b/image/page_drink_picture2_n/bn_Black_Menthe.png
--- a/image/page_drink_picture2_n/bn_Cafe_Avec_Liqueur.png
+++ b/image/page_drink_picture2_n/bn_Cafe_Avec_Liqueur.png
--- a/image/page_drink_picture2_n/bn_Espresso_Martini.png
+++ b/image/page_drink_picture2_n/bn_Espresso_Martini.png
--- a/image/page_drink_picture2_n/bn_Neon_Spark.png
+++ b/image/page_drink_picture2_n/bn_Neon_Spark.png
--- a/image/page_drink_picture2_n/bn_Russian_Mojito.png
+++ b/image/page_drink_picture2_n/bn_Russian_Mojito.png
--- a/image/page_drink_picture2_n/bn_Strawberry_Martini.png
+++ b/image/page_drink_picture2_n/bn_Strawberry_Martini.png
--- a/image/page_drink_picture2_n/bn_Summer_Chill.png
+++ b/image/page_drink_picture2_n/bn_Summer_Chill.png
--- a/image/page_drink_picture2_n/bn_Wakeup_Call.png
+++ b/image/page_drink_picture2_n/bn_Wakeup_Call.png
--- a/image/page_drink_picture2_n/bn_Yuzu_Highball.png
+++ b/image/page_drink_picture2_n/bn_Yuzu_Highball.png
--- a/image/page_drink_picture2_n/bn_Yuzu_Martini.png
+++ b/image/page_drink_picture2_n/bn_Yuzu_Martini.png
--- a/image/page_drink_press_n/bn_Almost_Umeshu.png
+++ b/image/page_drink_press_n/bn_Almost_Umeshu.png
--- a/image/page_drink_press_n/bn_Beachy_Mint.png
+++ b/image/page_drink_press_n/bn_Beachy_Mint.png
--- a/image/page_drink_press_n/bn_Black_Menthe.png
+++ b/image/page_drink_press_n/bn_Black_Menthe.png
--- a/image/page_drink_press_n/bn_Cafe_Avec_Liqueur.png
+++ b/image/page_drink_press_n/bn_Cafe_Avec_Liqueur.png
--- a/image/page_drink_press_n/bn_Espresso_Martini.png
+++ b/image/page_drink_press_n/bn_Espresso_Martini.png
--- a/image/page_drink_press_n/bn_Neon_Spark.png
+++ b/image/page_drink_press_n/bn_Neon_Spark.png
--- a/image/page_drink_press_n/bn_Russian_Mojito.png
+++ b/image/page_drink_press_n/bn_Russian_Mojito.png
--- a/image/page_drink_press_n/bn_Strawberry_Martini.png
+++ b/image/page_drink_press_n/bn_Strawberry_Martini.png
--- a/image/page_drink_press_n/bn_Summer_Chill.png
+++ b/image/page_drink_press_n/bn_Summer_Chill.png
--- a/image/page_drink_press_n/bn_Wakeup_Call.png
+++ b/image/page_drink_press_n/bn_Wakeup_Call.png
--- a/image/page_drink_press_n/bn_Yuzu_Highball.png
+++ b/image/page_drink_press_n/bn_Yuzu_Highball.png
--- a/image/page_drink_press_n/bn_Yuzu_Martini.png
+++ b/image/page_drink_press_n/bn_Yuzu_Martini.png
--- a/menu/new-layout.tsv
+++ b/menu/new-layout.tsv
@ -1147,6 +1147,7 @@ Name=CockTail,file=page_catalog_group_cocktail.skt
 		Draft Beer	Draft Beer	Beer	Beer	-	11-99-05-0028	-	bn_Draft_beer.png	-	-	-	posi1
 		Iced Beer 	Iced Beer 	Beer, Ice	Beer, Ice	-	11-99-05-0029	-	bn_Draft_beer_with_ice.png	-	-	-	posi1
 		Summer Chill	Summer Chill	Gin, Pineapple, Ginger, Ice	Gin, Pineapple, Ginger, Ice	-	11-99-05-0030	-	bn_Summer_Chill.png	-	-	-	posi1
+<<<<<<< HEAD
 		Neon Spark	Neon Spark	Vodka, Melon Syrup, Lime,\nSoda , Ice	Vodka, Melon Syrup, Lime,\nSoda , Ice	-	11-99-05-0031	-	bn_Neon_Spark.png	-	-	-	posi1
 		Yuzu Martini	Yuzu Martini	Gin, Vodka, Yuzu syrup , Ice	Gin, Vodka, Yuzu syrup , Ice	-	11-99-05-0032	-	bn_Yuzu_Martini.png	-	-	-	posi1
 		Strawberry Martini	Strawberry Martini	Gin, Vodka, Strawberry syrup\n, Ice	Gin, Vodka, Strawberry syrup\n, Ice	-	11-99-05-0033	-	bn_Strawberry_Martini.png	-	-	-	posi1
@ -1155,6 +1156,16 @@ Name=CockTail,file=page_catalog_group_cocktail.skt
 		Beachy Mint	Beachy Mint	Gin, Pineapple, Mint syrup,\nSoda, Ice	Gin, Pineapple, Mint syrup,\nSoda, Ice	-	11-99-05-0036	-	bn_Beachy_Mint.png	-	-	-	posi1
 		Black Menthe	Black Menthe	Black, Mint syrup, Lime,\nSoda, Ice	Black, Mint syrup, Lime,\nSoda, Ice	-	11-99-05-0037	-	bn_Black_Menthe.png	-	-	-	posi1
 		Wakeup Call	Wakeup Call	Vodka, Energy syrup,\nStrawberry syrup, Soda	Vodka, Energy syrup,\nStrawberry syrup, Soda	-	11-99-05-0038	-	bn_Wakeup_Call.png	-	-	-	posi1
+=======
+		Neon Spark	Neon Spark	Vodka, Melon Syrup, Lime, Soda , Ice	Vodka, Melon Syrup, Lime, Soda , Ice	-	11-99-05-0031	-	bn_Neon_Spark,png	-	-	-	posi1
+		Yuzu Martini	Yuzu Martini	Gin, Vodka, Yuzu syrup , Ice	Gin, Vodka, Yuzu syrup , Ice	-	11-99-05-0032	-	bn_Yuzu_Martini.png	-	-	-	posi1
+		Strawberry Martini	Strawberry Martini	Gin, Vodka, Strawberry syrup , Ice	Gin, Vodka, Strawberry syrup , Ice	-	11-99-05-0033	-	bn_Strawberry_Martini.png	-	-	-	posi1
+		Russian Mojito	Russian Mojito	Vodka, Mint syrup, Sugar, Lime, Ice	Vodka, Mint syrup, Sugar, Lime, Ice	-	11-99-05-0034	-	bn_Russian_Mojito.png	-	-	-	posi1
+		Yuzu Highball	Yuzu Highball	Black, Yuzu syrup, Ice	Black, Yuzu syrup, Ice	-	11-99-05-0035	-	bn_Yuzu_Highball.png	-	-	-	posi1
+		Beachy Mint	Beachy Mint	Gin, Pineapple, Mint syrup, Soda, Ice	Gin, Pineapple, Mint syrup, Soda, Ice	-	11-99-05-0036	-	bn_Beachy_Mint.png	-	-	-	posi1
+		Black Menthe	Black Menthe	Black, Mint syrup, Lime, Soda, Ice	Black, Mint syrup, Lime, Soda, Ice	-	11-99-05-0037	-	bn_Black_Menthe.png	-	-	-	posi1
+		Wakeup Call	Wakeup Call	Vodka, Energy syrup, Strawberry syrup, Soda	Vodka, Energy syrup, Strawberry syrup, Soda	-	11-99-05-0038	-	bn_Wakeup_Call.png	-	-	-	posi1
+>>>>>>> 7270d1b97798eab55bc5a3ca86199c53890ec054
 		Almost Umeshu	Almost Umeshu	Black, Plum syrup, Lime, Ice	Black, Plum syrup, Lime, Ice	-	11-99-05-0039	-	bn_Almost_Umeshu.png	-	-	-	posi1
 		Café Avec Liqueur	Café Avec Liqueur	Vodka, Coffee, Milk, Sugar, Ice	Vodka, Coffee, Milk, Sugar, Ice	-	11-99-05-0040	-	bn_Cafe_Avec_Liqueur.png	-	-	-	posi1
 		Espresso Martini	Espresso Martini	Gin, Coffee, Sugar, Ice	Gin, Coffee, Sugar, Ice	-	11-99-05-0041	-	bn_Espresso_Martini.png	-	-	-	posi1