making rebasing easier

TJTorola · May 31, 2016 · 41a1b6a · 41a1b6a
1 parent 2217c0d
commit 41a1b6a
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,14 @@
 * text=auto
 *.css linguist-vendored
 *.less linguist-vendored
+
+resources/assets/css/_bootstrap.css merge=ours
+resources/assets/css/adminLTE.css merge=ours
+resources/assets/css/font-awesome.css merge=ours
+resources/assets/css/main.css merge=ours
+resources/assets/css/skin-blue.css merge=ours
+
+public/js/main.min.js merge=ours
+public/js/vendor.min.js merge=ours
+public/js/main.min.js.map merge=ours
+public/js/vendor.min.js.map merge=ours