From 782c8aaf0f5075e99d7b3f55c66f24206c55bccb Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 27 Oct 2011 14:29:38 +0200 Subject: [PATCH] ignore home text --- en/.gitattributes | 2 ++ fr/.gitattributes | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 en/.gitattributes create mode 100644 fr/.gitattributes diff --git a/en/.gitattributes b/en/.gitattributes new file mode 100644 index 0000000..ea96728 --- /dev/null +++ b/en/.gitattributes @@ -0,0 +1,2 @@ +home.rst merge=ours +legal_notices.rst merge:ours diff --git a/fr/.gitattributes b/fr/.gitattributes new file mode 100644 index 0000000..ea96728 --- /dev/null +++ b/fr/.gitattributes @@ -0,0 +1,2 @@ +home.rst merge=ours +legal_notices.rst merge:ours -- 2.39.5