From a9e80d9e698d4fd6be14bb11e95872d981cdd532 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 27 Oct 2011 14:26:37 +0200 Subject: [PATCH] ignore home text --- telemeta/pages/en/.gitattributes | 3 +++ telemeta/pages/fr/.gitattributes | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 telemeta/pages/en/.gitattributes create mode 100644 telemeta/pages/fr/.gitattributes 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 + -- 2.39.5