clean up repo

2017-01-30 11:18:47 -05:00 · 2017-01-30 11:18:47 -05:00 · 1620b147da
commit 1620b147da
parent e1d1691cb9
32 changed files with 7 additions and 17724 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,7 +1 @@
-<<<<<<< HEAD
-* text=auto
-=======
-* text eol=crlf
-*.min.js binary
-*.map binary
->>>>>>> origin/next
+* text=auto