From: yomguy <yomguy@parisson.com>
Date: Fri, 28 Oct 2011 12:35:47 +0000 (+0200)
Subject: fix ignore files
X-Git-Tag: 1.1~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e769a56ef78866fbc50713941f5c3b5a084311aa;p=telemeta.git

fix ignore files
---

diff --git a/telemeta/pages/.gitattributes b/telemeta/pages/.gitattributes
new file mode 100644
index 00000000..4da71dfd
--- /dev/null
+++ b/telemeta/pages/.gitattributes
@@ -0,0 +1,2 @@
+*.rst merge=ours
+
diff --git a/telemeta/pages/en/.gitattributes b/telemeta/pages/en/.gitattributes
deleted file mode 100644
index a84e433c..00000000
--- a/telemeta/pages/en/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-*.rst
-