From: yomguy <yomguy@parisson.com>
Date: Fri, 28 Oct 2011 12:11:31 +0000 (+0200)
Subject: fix got ignore
X-Git-Tag: 1.3.9~3^2~1^2~51
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=15f3ce44d55e5be120dee7fd6c6c2eedc3e796b9;p=telemeta.git

fix got ignore
---

15f3ce44d55e5be120dee7fd6c6c2eedc3e796b9
diff --cc telemeta/pages/en/.gitattributes
index 87e781d3,a84e433c..30d85567
--- a/telemeta/pages/en/.gitattributes
+++ b/telemeta/pages/en/.gitattributes
@@@ -1,1 -1,2 +1,1 @@@
- home.rst legal_notices.rst merge=ours
+ *.rst
 -
diff --cc telemeta/pages/fr/.gitattributes
index 87e781d3,a84e433c..30d85567
--- a/telemeta/pages/fr/.gitattributes
+++ b/telemeta/pages/fr/.gitattributes
@@@ -1,1 -1,2 +1,1 @@@
- home.rst legal_notices.rst merge=ours
+ *.rst
 -