merger

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

@@ -124,7 +124,7 @@ admin.pluginList = {
             data: JSON.stringify(requestJSONObject),
             success: function(result, textStatus){
                 $("#tipMsg").text(result.msg);
-                
+                
 
                 $("#PluginSetting").html(result);
                 $("#PluginSetting").dialog({
@@ -134,16 +134,16 @@ admin.pluginList = {
                     "hideFooter": true
                 });
 
+=======
+>>>>>>> branch '0.5.6' of https://github.com/b3log/b3log-solo.git
                 $("#pluginSetting").html(result);
                 $("#pluginSetting").dialog("open");
-                
-                $("#loadMsg").text("");
-            }
-        });
-    },
+                
 
-    
- 
+=======
+>>>>>>> branch '0.5.6' of https://github.com/b3log/b3log-solo.git
+                $(
+    },
     changeStatus: function (pluginId, status) {
         if (status === "ENABLED") {
             status = "DISABLED";