Recompile assets

This commit is contained in:
James Brooks 2014-12-04 23:06:33 +00:00
parent 5070e00d50
commit e843dad139
3 changed files with 2 additions and 150 deletions

File diff suppressed because one or more lines are too long

View File

@ -85,6 +85,7 @@ body.dashboard .navbar {
body.dashboard .sidebar {
height: 100%;
position: fixed;
z-index: 998;
width: 250px;
background: #37474f;
-webkit-transition: margin 0.2s;

View File

@ -1,9 +1,4 @@
{
<<<<<<< HEAD
"css/all.css": "css/all-a955efc4.css",
"css/all.css": "css/all-d7f46061.css",
"js/all.js": "js/all-c84ab03b.js"
=======
"css/all.css": "css/all-b076f8da.css",
"js/all.js": "js/all-86e91591.js"
>>>>>>> 93289f2922b2eba558b0562dde18e4a008267df3
}