解决冲突

application/controllers/information.php

@@ -1341,23 +1341,13 @@ class Information extends CI_Controller
       $meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture');
     }
 
-<<<<<<< HEAD
 
     //顶部视频
     $meta_news_video = get_meta($information->ic_id, 'meta_news_video');
     $meta_video_picture = get_meta($information->ic_id, 'meta_video_picture');
     if (!empty ($meta_news_video) && !empty ($meta_video_picture)) {
       $template = str_replace('<!--@TOP-VIDEO@-->', '<div class="detailtopbanner"><video autoplay="" controls="controls" id="bgvid" poster="' . $meta_video_picture . '" src="' . $meta_news_video . '" style="position: inherit;"> </video></div>', $template);
-=======
-    // 火车票首页搜索框 --zp
-    $template_TrainSearch = "";
-    if ($information->ic_url == "/china-trains/hometest.htm" || $information->ic_url == "/china-trains/") {
-      $template_TrainSearch = $this->load->view($template_path . '-train-index', null, true);
-      if ($device == "mobile") {
-        //手机端的搜索框直接显示，不再加背景图，这样可以保证CLS分数。
-        $template = str_replace('<!--@TOP-BANNER@-->', '<div class="detailtopbanner">' . $template_TrainSearch . '</div>', $template);
-      }
->>>>>>> a269b1fdf454c4534d9f0f92ad131675a0263294
+
     }
 
     if (is_file('D:/wwwroot/origin-data.chinahighlights.com/css/mobile-first.css')) { //主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速