From: yomguy <yomguy@parisson.com>
Date: Thu, 27 Oct 2011 12:26:37 +0000 (+0200)
Subject: ignore home text
X-Git-Tag: 1.1~20
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a9e80d9e698d4fd6be14bb11e95872d981cdd532;p=telemeta.git

ignore home text
---

diff --git a/telemeta/pages/en/.gitattributes b/telemeta/pages/en/.gitattributes
new file mode 100644
index 00000000..52198639
--- /dev/null
+++ b/telemeta/pages/en/.gitattributes
@@ -0,0 +1,3 @@
+home.rst merge=ours
+legal_notices.rst merge=ours
+
diff --git a/telemeta/pages/fr/.gitattributes b/telemeta/pages/fr/.gitattributes
new file mode 100644
index 00000000..52198639
--- /dev/null
+++ b/telemeta/pages/fr/.gitattributes
@@ -0,0 +1,3 @@
+home.rst merge=ours
+legal_notices.rst merge=ours
+