From eec08a20f280628acbd523b2d2734ce27998296d Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 27 Oct 2011 14:26:37 +0200 Subject: [PATCH] ignore home text --- en/.gitattributes | 3 +++ fr/.gitattributes | 3 +++ 2 files changed, 6 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..5219863 --- /dev/null +++ b/en/.gitattributes @@ -0,0 +1,3 @@ +home.rst merge=ours +legal_notices.rst merge=ours + diff --git a/fr/.gitattributes b/fr/.gitattributes new file mode 100644 index 0000000..5219863 --- /dev/null +++ b/fr/.gitattributes @@ -0,0 +1,3 @@ +home.rst merge=ours +legal_notices.rst merge=ours + -- 2.39.5