From 0f245e3191b884901edf59d5a149a7875823e10e Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 1 Feb 2023 10:20:00 +0800
Subject: [PATCH] 11

---
 application/views/mobile_first/ch-pc.php | 46 ++++++++----------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 270281e4..db43542a 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -88,7 +88,6 @@
                         id="china_destinations_2021">Destinations</a>
                     <div class="destinationspc dropdown-content">
                         <ul class="list-reset  sidebar">
-<<<<<<< HEAD
                             <li class="start-nav-item"><a href="/beijing/tours.htm" id="beijing_tours_2021">Beijing</a></li>
                             <li class="start-nav-item"><a href="/xian/tours.htm" id="xian_tours_2021">Xi&#39;an</a></li>
                             <li class="start-nav-item"><a href="/shanghai/tours.htm" id="shanghai_tours_2021">Shanghai</a></li>
@@ -190,32 +189,7 @@
                         </ul>
                     </div>
                 </li>
-            </ul>
-
-            <div class="pcnavibutton">
-                <div class="topnavitailor"><a href="/contactus/" id="contact_us_2021">Contact Us</a></div>
-                <div class="siteSearch ">
-                    <form class="searchtextbox" id="searchbox_001281624266240652297:cl1fy1cxepi" name="googlesreach"
-                        action="https://secure.chinahighlights.com/result.asp">
-                        <input type="hidden" value="001281624266240652297:cl1fy1cxepi" name="cx">
-                        <input type="hidden" value="FORID:9" name="cof">
-                        <input type="text" onfocus="this.value = ''" class="strkeys"
-                            placeholder="Search China Highlights" name="q">
-                        <input type="image" class="submits"
-                            src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png" width="25px">
-                    </form>
-=======
-                            <li class="start-nav-item"><a href="/travelguide/chinese-zodiac/" id="china_zodiac_2021">Chinese Zodiac</a></li>
-                            <li class="start-nav-item"><a href="/travelguide/special-report/chinese-new-year/" id="china_new_year_2021">Chinese New Year</a></li>
-                            <li class="start-nav-item"><a href="/travelguide/culture/china-history.htm" id="china_history_2021">China History</a></li>
-                            <li class="start-nav-item"><a href="/travelguide/religion.htm" id="china_religions_2021">Chinese Religions</a></li>
-                            <li class="start-nav-item"><a href="/festivals/" id="china_festivals_2021">Chinese Festivals</a></li>
-                            <li class="start-nav-item"><a href="/travelguide/chinese-food/" id="china_food_2021">Chinese Food</a></li>
-                            <li class="start-nav-item"><a href="/travelguide/kungfu/" id="china_kungfu_2021">Kung Fu</a></li>
-                            <li class="start-nav-item start-nav-item-last"><a href="/travelguide/chinese-tea/" id="china_tea_2021">Chinese Tea</a></li>                          
-                        </ul>                  
-                </div>
-            </li>
+  
             <li class="dropdown"><a href="/china-trains/" class="p_topnavilink">Trains</a>
                 <div class="travelguidepc dropdown-content">
                     <ul class="list-reset  sidebar">
@@ -241,11 +215,21 @@
                         <li class="start-nav-item"><a href="/day-tours/yunnan/">Yunnan</a></li>    
                         <li class="start-nav-item"><a href="/day-tours/great-wall-hiking/">Great Wall Tours</a></li>
                         <li class="start-nav-item"><a href="/day-tours/china-food-tours/">Food Tours</a></li>
-                        <li class="start-nav-item start-nav-item-last"><a href="/day-tours/activities/">Fun Activities</a></li>                    
+                        <li class="start-nav-item start-nav-item-last"><a href="/day-tours/activities/">Fun Activities</a></li>     
+                    </li>               
                     </ul>
->>>>>>> 8a863a0b17c441db634cfba61ec00873659e0983
-                </div>
-            </div>
+                    <div class="pcnavibutton">
+                        <div class="topnavitailor"><a href="/contactus/" id="contact_us_2021">Contact Us</a></div>
+                        <div class="siteSearch">
+                            <form class="searchtextbox" id="searchbox_001281624266240652297:cl1fy1cxepi" name="googlesreach" action="https://secure.chinahighlights.com/result.asp">
+                                <input type="hidden" value="001281624266240652297:cl1fy1cxepi" name="cx">
+                                <input type="hidden" value="FORID:9" name="cof">
+                                <input type="text" onfocus="this.value = ''" class="strkeys" placeholder="Search China Highlights" name="q">
+                                <input type="image" class="submits" src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png" width="25px">
+                            </form>
+                        </div>
+                    </div>
+              
         </nav>
     </header>
     <div class="updated_news">