Adding .gitattributes to always use our version of index.html and ind…

…ex.rss when merging from upstream.
funkyHat · Mar 17, 2010 · ddf1440 · ddf1440
1 parent 8e5a837
commit ddf1440
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+index.html merge=ours
+index.rss merge=ours