无JIRA任务，解决冲突

src/base/1.pane.js

@@ -40,7 +40,7 @@ BI.Pane = BI.inherit(BI.Widget, {
 
     loading: function () {
         var self = this, o = this.options;
-        var loadingAnimation = BI.createWidget(BI.Providers.getProvider("bi.provider.system").getLoading({ 
+        var loadingAnimation = BI.createWidget(BI.Providers.getProvider("bi.provider.system").getLoading({
             loadingSize: o.loadingSize,
             context: this
         }));