Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
hotfix/paypal-note
candice 2 years ago
parent 80de54580f
commit 29d6e9bcae
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File

28
application/views/mobile_first/ch.php
Unescape Escape View File

@ -184,8 +184,6 @@
Top Attractions</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/weather/">China Weather</a></li>
</ul>
<<<<<<< HEAD
<!-- Culture -->
<ul data-menu="submenu-4" id="submenu-4" class="menu__level" tabindex="-1" role="menu" aria-label="Culture">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/travelguide/culture/">Culture</a></li>
@ -249,31 +247,7 @@
<li class="menu__item" role="menuitem"><a href="/tour/asia-tours/" target="_blank"
class="menu__link">More Asia Tours</a></li>
</ul>
=======
<!-- train -->
<ul data-menu="submenu-5" id="submenu-5" class="menu__level" tabindex="-1" role="menu" aria-label="Trains">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-trains/">Search Train</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-trains/china-railway-station.htm">Train Stations and Schedules</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-trains/train-travel.htm">Train Travel</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-flights/">Flight</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-trains/china-train-app-download.htm">Train App Download</a></li>
</ul>
<!-- Day Tours -->
<ul data-menu="submenu-6" id="submenu-6" class="menu__level" tabindex="-1" role="menu"
aria-label="Day-Tours">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/beijing/">Beijing</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/shanghai/">Shanghai</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/xian/">Xi&#39;an</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/chengdu/">Chengdu</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/guilin/">Guilin</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/zhangjiajie/">Zhangjiajie</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/huangshan/">Huangshan</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/yunnan/">Yunnan</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/great-wall-hiking/">Great Wall Tours</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/china-food-tours/">Food Tours</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/activities/">Fun Activities</a></li>
</ul>
>>>>>>> 8a863a0b17c441db634cfba61ec00873659e0983
</div>

Write Preview
Loading…
Cancel
Save