From a3044ce653ae6422961fd6a64cec5121a1680b15 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 27 Oct 2011 14:29:38 +0200 Subject: [PATCH] ignore home text --- telemeta/pages/en/.gitattributes | 2 ++ telemeta/pages/fr/.gitattributes | 2 ++ 2 files changed, 4 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..ea967284 --- /dev/null +++ b/telemeta/pages/en/.gitattributes @@ -0,0 +1,2 @@ +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..ea967284 --- /dev/null +++ b/telemeta/pages/fr/.gitattributes @@ -0,0 +1,2 @@ +home.rst merge=ours +legal_notices.rst merge:ours -- 2.39.5