调整

app/views/managements/partners.html.erb

@@ -62,18 +62,14 @@
             $(this).parents("li").remove();
         })
 
-<<<<<<< HEAD
         $(".manageList").on("click",".addManage",function(){
             var html="<%= escape_javascript(render :partial => "managements/partner_addManage") %>";
             pop_box_new(html,572,500);
         })
-=======
         $(".addOperation").on("click",function(){
             var html="<%= escape_javascript(render :partial => "managements/partner_addUnit") %>";
             pop_box_new(html,572,500);
         })
 
-
->>>>>>> 0aec53dda74a8e3e3ac8c0f2cd70e38a65bfecbe
     })
 </script>