]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cf76d37)
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)
telemeta/pages/en/.gitattributes patch | blob | history
telemeta/pages/fr/.gitattributes patch | blob | history

diff --git a/telemeta/pages/en/.gitattributes b/telemeta/pages/en/.gitattributes
index a831bc5577aa8b3a77d4f212475f2ef4e3283119..a84e433c535225228ff139f94ec04d9dd07fec39 100644 (file)
--- a/telemeta/pages/en/.gitattributes
+++ b/telemeta/pages/en/.gitattributes
@@ -1,2 +1,2 @@
-home.rst legal_notices.rst merge=ours
+*.rst
 
diff --git a/telemeta/pages/fr/.gitattributes b/telemeta/pages/fr/.gitattributes
index a831bc5577aa8b3a77d4f212475f2ef4e3283119..a84e433c535225228ff139f94ec04d9dd07fec39 100644 (file)
--- a/telemeta/pages/fr/.gitattributes
+++ b/telemeta/pages/fr/.gitattributes
@@ -1,2 +1,2 @@
-home.rst legal_notices.rst merge=ours
+*.rst
 
Unnamed repository; edit this file 'description' to name the repository.