Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

…ex.rss when merging from upstream.
  • Loading branch information...
commit ddf1440de7f06c0f008e183ea66a16bb5210a6a6 1 parent 8e5a837
Alan Rogers authored
Showing with 2 additions and 0 deletions.
  1. +2 −0  .gitattributes
2  .gitattributes
View
@@ -0,0 +1,2 @@
+index.html merge=ours
+index.rss merge=ours
Please sign in to comment.
Something went wrong with that request. Please try again.