From: yomguy Date: Thu, 27 Oct 2011 12:29:38 +0000 (+0200) Subject: ignore home text X-Git-Tag: 1.3.9~3^2~1^2~59 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a3044ce653ae6422961fd6a64cec5121a1680b15;p=telemeta.git ignore home text --- 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