From 55d8dd0a459ed568b4e13b89749e471e88a8bf04 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 19 Feb 2025 15:21:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BB=86=E8=8A=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile_first/ah-lantern-form-2025.php      | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/application/views/mobile_first/ah-lantern-form-2025.php b/application/views/mobile_first/ah-lantern-form-2025.php
index 8a6618dc..3f837f8b 100644
--- a/application/views/mobile_first/ah-lantern-form-2025.php
+++ b/application/views/mobile_first/ah-lantern-form-2025.php
@@ -54,15 +54,9 @@
         <div id="ticket_type_errmsg" style="display: none">
           <div class="requiredArea" style="margin-top:-10px;">Please select at least one option.</div>
         </div>
-<<<<<<< HEAD
         <p style="font-size: 22px;margin-bottom: 5px;"><strong>Exclusive Add-on:</strong></p>
 
         <p style="margin-bottom: 5px;">Thai Costume with Makeup & Hairstyle – US$119 per person</p>
-=======
-        <p style="font-size: 22px;"><strong>Exclusive Add-on:</strong></p>
-
-        <p>Thai Costume with Makeup & Hairstyle – US$119 per person</p>
->>>>>>> 566b85b362494b7003b58b1035538d1b84908afc
 
         <div class="numberBtn">
             <input class="minaddBtn reduceadult" id='minusButton_makeup' type="button" value="-">
@@ -75,13 +69,7 @@
                 font-size: 20px;">
             <input class="minaddBtn addadult" id='plusButton_makeup' type="button" value="+">
         </div>
-
-<<<<<<< HEAD
         <p style="font-size: 22px;margin-bottom: 5px; margin-top: 10px;"><strong>Select Ticket Quantity</strong></p>
-=======
-        <p style="font-size: 22px;"><strong>Select Ticket Quantity</strong></p>
->>>>>>> 566b85b362494b7003b58b1035538d1b84908afc
-
         <div class="peopleSelect" style="width: auto;">
             <span class="formMemo">
                 Adults and older children (8+ years old)