resolved conflict with master

2015-05-23 13:11:51 +03:00
parent fa75a8d3b0
commit 68ff51a0c4
2 changed files with 2 additions and 10 deletions
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -532,12 +532,8 @@ function _init() {
  $.AdminLTE.boxWidget = {
    selectors: $.AdminLTE.options.boxWidgetOptions.boxWidgetSelectors,
    icons: $.AdminLTE.options.boxWidgetOptions.boxWidgetIcons,
-<<<<<<< HEAD
-    animationSpeed: $.AdminLTE.options.animationSpeed,
-    activate: function () {
-=======
+    animationSpeed: $.AdminLTE.options.animationSpeed,    
    activate: function (_box) {
->>>>>>> refs/remotes/origin/master
      var _this = this;
      if (! _box) {
        _box = document; // activate all boxes per default
--- a/dist/js/app.min.js
+++ b/dist/js/app.min.js