From: yomguy <yomguy@parisson.com>
Date: Thu, 27 Oct 2011 12:32:15 +0000 (+0200)
Subject: fix ignore
X-Git-Tag: 1.3.9~3^2~1^2~58
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8039f4c760760a5babd888a5035bda846b468660;p=telemeta.git

fix ignore
---

diff --git a/telemeta/pages/en/.gitattributes b/telemeta/pages/en/.gitattributes
index ea967284..87e781d3 100644
--- 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 ea967284..87e781d3 100644
--- 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