From: yomguy <yomguy@parisson.com>
Date: Thu, 27 Oct 2011 12:32:58 +0000 (+0200)
Subject: fix ignore
X-Git-Tag: 1.1~19
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a198ab9cec8208910aa968dd18e16e7a3bb8ca51;p=telemeta.git

fix ignore
---

diff --git a/telemeta/pages/en/.gitattributes b/telemeta/pages/en/.gitattributes
index 52198639..a831bc55 100644
--- a/telemeta/pages/en/.gitattributes
+++ b/telemeta/pages/en/.gitattributes
@@ -1,3 +1,2 @@
-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 52198639..a831bc55 100644
--- a/telemeta/pages/fr/.gitattributes
+++ b/telemeta/pages/fr/.gitattributes
@@ -1,3 +1,2 @@
-home.rst merge=ours
-legal_notices.rst merge=ours
+home.rst legal_notices.rst merge=ours