Trimming gitattributes

HarperDB · Jul 12, 2015 · 1de46e6 · 1de46e6
1 parent 1c9a05f
commit 1de46e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1,7 @@
 # Auto detect text files and perform LF normalization
 
 *        text=auto
+
 *.cs     text diff=csharp eol=lf
 *.java   text diff=java eol=lf
 *.html   text diff=html eol=lf
@@ -23,19 +24,12 @@
 *.csproj text merge=union eol=lf
 *.sln    text merge=union eol=crlf
 
-
-alasql.js binary
-alasql.js.map binary
-alasql.min.js binary
 *.xlsx binary
 *.xls binary
 
-console/alasql.min.js merge=ours
-dist/alasql.js merge=ours
-dist/alasql.min.js merge=ours
-test/restest169a.xlsx merge=ours
-test/restest251.xlsx merge=ours
-test/restest255.xlsx merge=ours
+alasql.js binary merge=ours
+alasql.js.map binary merge=ours
+alasql.min.js binary merge=ours
 
 
 # absolute paths are ok, as are globs

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 # Results of tests
-test/res
+test/res*