'解决冲突'

application/admin/view/menu.html

@@ -178,6 +178,21 @@
         </li>
     </ul>
 </li>
+<li class="menu">
+    <a href="#">
+        <i class="fa fa-comments-o"></i>
+        <span class="nav-label">客服公告</span>
+        <span class="fa arrow"></span>
+    </a>
+    <ul class="nav nav-second-level">
+        <li>
+            <a class="J_menuItem" href="{:url('kfnotice/index')}">公告列表</a>
+        </li>
+        <li>
+            <a class="J_menuItem" href="{:url('kfnotice/add')}">添加公告</a>
+        </li>
+    </ul>
+</li>
 <script src="__JS__/jquery.min.js?v=2.1.4"></script>
 <script>
     $.ajax({
@@ -207,8 +222,6 @@
             );
         }
     });
-
-<<<<<<< HEAD
     $n = 1;
     $(document).on("click","#side-menu>li",function(){
         console.log(1234);
@@ -224,21 +237,3 @@
         }
     });
 </script>
-=======
-<li class="menu">
-    <a href="#">
-        <i class="fa fa-comments-o"></i>
-        <span class="nav-label">客服公告</span>
-        <span class="fa arrow"></span>
-    </a>
-    <ul class="nav nav-second-level">
-        <li>
-            <a class="J_menuItem" href="{:url('kfnotice/index')}">公告列表</a>
-        </li>
-        <li>
-            <a class="J_menuItem" href="{:url('kfnotice/add')}">添加公告</a>
-        </li>
-    </ul>
-</li>
-
->>>>>>> d7221b8b22f990bd668469d6f4bdea47bec592b5