formatter

war/src/main/webapp/js/admin/latkeAdmin.js

@@ -3085,8 +3085,7 @@ admin.pluginList = {
             data: JSON.stringify(requestJSONObject),
             success: function(result, textStatus){
                 $("#tipMsg").text(result.msg);
-                
-<<<<<<< HEAD
+                
 
                 $("#PluginSetting").html(result);
                 $("#PluginSetting").dialog({
@@ -3100,21 +3099,12 @@ admin.pluginList = {
 >>>>>>> branch '0.5.6' of https://github.com/b3log/b3log-solo.git
                 $("#pluginSetting").html(result);
                 $("#pluginSetting").dialog("open");
-                
-<<<<<<< HEAD
+                
 
 =======
 >>>>>>> branch '0.5.6' of https://github.com/b3log/b3log-solo.git
-                $("#loadMsg").text("");
-            }
-        });
-    },
-<<<<<<< HEAD
-
-=======
-    
- 
->>>>>>> branch '0.5.6' of https://github.com/b3log/b3log-solo.git
+                $(
+    },
     changeStatus: function (pluginId, status) {
         if (status === "ENABLED") {
             status = "DISABLED";
@@ -3857,4 +3847,4 @@ admin.register["about"] = {
     "refresh": function () {
         $("#loadMsg").text("");
     }
-}
+}
\ No newline at end of file