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

fix ignore files
---

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..4da71df
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.rst merge=ours
+
diff --git a/en/.gitattributes b/en/.gitattributes
deleted file mode 100644
index a84e433..0000000
--- a/en/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-*.rst
-