From: yomguy <yomguy@parisson.com>
Date: Fri, 28 Oct 2011 12:11:04 +0000 (+0200)
Subject: fix got ignore
X-Git-Tag: 1.1~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6c22d0d67b293b59dfcd2c50f9be50eed9e44df7;p=telemeta.git

fix got ignore
---

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