D'oh! Avoid annoyances with Grunt.
-
Upload
paul-schreiber -
Category
Technology
-
view
201 -
download
0
Transcript of D'oh! Avoid annoyances with Grunt.
diff --cc assets/js/admin.src.jsindex 85018e9,ff5fdc7..0000000--- a/assets/js/admin.src.js+++ b/assets/js/admin.src.js@@@ -1,4 -1,4 +1,4 @@@ -/*! FiveThirtyEight - v0.1.0 - 2014-11-21 -/*! FiveThirtyEight - v0.1.0 - 2014-12-05++/*! FiveThirtyEight - v0.1.0 - 2014-12-09 * * Copyright (c) 2014; * Licensed GPLv2+ */ (function (window, $, fteContributors) {
Auto-merging assets/js/admin.src.css CONFLICT (content): Merge conflict in assets/js/admin.src.css Auto-merging assets/js/admin.min.css CONFLICT (content): Merge conflict in assets/js/admin.min.css Automatic merge failed; fix conflicts and then commit the result.
diff --git a/assets/css/burrito.src.css b/assets/css/burrito.src.cssindex c87230e..748cd49 100644--- a/assets/css/burrito.src.css+++ b/assets/css/burrito.src.css@@ -104,14 +104,14 @@ iframe[scrolling="no"] { overflow: hidden; }-#table-view table tbody.orange tr:first-child td { background: -moz-linear-gradient(top, #ffffff 95%, rgba(255, 110, 39, 0+#table-view table tbody.orange tr:first-child td { background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBl