From: yomguy Date: Thu, 27 Oct 2011 12:32:15 +0000 (+0200) Subject: fix ignore X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ca0c3104ccfeeabdb78053e0299691d9f887f8e1;p=telemeta-pages.git fix ignore --- diff --git a/en/.gitattributes b/en/.gitattributes index ea96728..87e781d 100644 --- a/en/.gitattributes +++ b/en/.gitattributes @@ -1,2 +1 @@ -home.rst merge=ours -legal_notices.rst merge:ours +home.rst legal_notices.rst merge=ours diff --git a/fr/.gitattributes b/fr/.gitattributes index ea96728..87e781d 100644 --- a/fr/.gitattributes +++ b/fr/.gitattributes @@ -1,2 +1 @@ -home.rst merge=ours -legal_notices.rst merge:ours +home.rst legal_notices.rst merge=ours