From: yomguy Date: Thu, 27 Oct 2011 12:29:38 +0000 (+0200) Subject: ignore home text X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=782c8aaf0f5075e99d7b3f55c66f24206c55bccb;p=telemeta-pages.git ignore home text --- 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