Add a .gitattributes file to ignore the resources files in diffs and …

…merge conflicts.
sarahmaddox · Dec 4, 2018 · b17e908 · b17e908
1 parent 614aa20
commit b17e908
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,3 @@
+# Ignore the resources files in diffs and merge conflicts
+resources/    linguist-generated=true
+resources/    -diff -merge