diff --git a/upload/styles/cb_2014/theme/css/main.css b/upload/styles/cb_2014/theme/css/main.css
index b4d8af02..8defcff2 100755
--- a/upload/styles/cb_2014/theme/css/main.css
+++ b/upload/styles/cb_2014/theme/css/main.css
@@ -2066,9 +2066,7 @@ padding: 7px 15px;
 .dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#cccccc;margin-top:5px;margin-right:-10px;}
 .dropdown-submenu:hover>a:after{border-left-color:#ffffff;}
 .dropdown-submenu.pull-left{float:none;}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;}
-<<<<<<< .mine
->>>>>>> .r1464
-=======
+
 /*View Channels*/
 .channels-view{
  border-bottom: 1px solid #DDDDDD;