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

fix got ignore
---

b7915d6978a904049661aece010aa2c40c04ae9f
diff --cc en/.gitattributes
index 87e781d,a84e433..30d8556
--- a/en/.gitattributes
+++ b/en/.gitattributes
@@@ -1,1 -1,2 +1,1 @@@
- home.rst legal_notices.rst merge=ours
+ *.rst
 -
diff --cc fr/.gitattributes
index 87e781d,a84e433..30d8556
--- a/fr/.gitattributes
+++ b/fr/.gitattributes
@@@ -1,1 -1,2 +1,1 @@@
- home.rst legal_notices.rst merge=ours
+ *.rst
 -