add merge rule for .npmignore

kinalabina · Feb 23, 2017 · 6123898 · 6123898
1 parent 1ecfa42
commit 6123898
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+.npmignore merge=ours