github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

resolved conflict with master

pull/456/head
Abdullah Almsaeed 2015-05-23 13:11:51 +03:00
parent fa75a8d3b0
commit 68ff51a0c4
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/js/app.js vendored
View File

@ -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

6
dist/js/app.min.js vendored
View File

File diff suppressed because one or more lines are too long