Conflicts:
	src/main/webapp/js/application.js
This commit is contained in:
diver-sity 2014-09-13 17:31:03 +10:00
commit 710e3ee1ee

View File

@ -11,7 +11,7 @@ var app = function() {
sideBarLeftInit();
window.onresize = function(){
sideBarLeftInit();
};
}
closePanel();
};
@ -221,7 +221,6 @@ var app = function() {
morrisPie: morrisPie,
sideBarLeftInit:sideBarLeftInit
};
}();