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

fix got ignore
---

diff --git a/en/.gitattributes b/en/.gitattributes
index a831bc5..a84e433 100644
--- a/en/.gitattributes
+++ b/en/.gitattributes
@@ -1,2 +1,2 @@
-home.rst legal_notices.rst merge=ours
+*.rst
 
diff --git a/fr/.gitattributes b/fr/.gitattributes
index a831bc5..a84e433 100644
--- a/fr/.gitattributes
+++ b/fr/.gitattributes
@@ -1,2 +1,2 @@
-home.rst legal_notices.rst merge=ours
+*.rst