]> 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: a3044ce)
fix ignore
authoryomguy <yomguy@parisson.com>
Thu, 27 Oct 2011 12:32:15 +0000 (14:32 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 27 Oct 2011 12:32:15 +0000 (14:32 +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 ea967284a09e8ca3530b68d6f28c9cf902228d2f..87e781d3415bb0e34ee5abca5fbf66db1b06d1bf 100644 (file)
--- a/telemeta/pages/en/.gitattributes
+++ b/telemeta/pages/en/.gitattributes
@@ -1,2 +1 @@
-home.rst merge=ours
-legal_notices.rst merge:ours
+home.rst legal_notices.rst merge=ours
diff --git a/telemeta/pages/fr/.gitattributes b/telemeta/pages/fr/.gitattributes
index ea967284a09e8ca3530b68d6f28c9cf902228d2f..87e781d3415bb0e34ee5abca5fbf66db1b06d1bf 100644 (file)
--- a/telemeta/pages/fr/.gitattributes
+++ b/telemeta/pages/fr/.gitattributes
@@ -1,2 +1 @@
-home.rst merge=ours
-legal_notices.rst merge:ours
+home.rst legal_notices.rst merge=ours
Unnamed repository; edit this file 'description' to name the repository.