From f5746f08398edd673576c99c4591ced37281f72a Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 4 Apr 2019 11:19:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/managements/partners.html.erb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/views/managements/partners.html.erb b/app/views/managements/partners.html.erb
index a16d117e..28105434 100644
--- a/app/views/managements/partners.html.erb
+++ b/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>
\ No newline at end of file