]> git.parisson.com Git - telemeta-pages.git/commitdiff
fix got ignore
authoryomguy <yomguy@parisson.com>
Fri, 28 Oct 2011 12:11:04 +0000 (14:11 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 28 Oct 2011 12:11:04 +0000 (14:11 +0200)
en/.gitattributes
fr/.gitattributes

index a831bc5577aa8b3a77d4f212475f2ef4e3283119..a84e433c535225228ff139f94ec04d9dd07fec39 100644 (file)
@@ -1,2 +1,2 @@
-home.rst legal_notices.rst merge=ours
+*.rst
 
index a831bc5577aa8b3a77d4f212475f2ef4e3283119..a84e433c535225228ff139f94ec04d9dd07fec39 100644 (file)
@@ -1,2 +1,2 @@
-home.rst legal_notices.rst merge=ours
+*.rst