From ca0c3104ccfeeabdb78053e0299691d9f887f8e1 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 27 Oct 2011 14:32:15 +0200 Subject: [PATCH] fix ignore --- en/.gitattributes | 3 +-- fr/.gitattributes | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) 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 -- 2.39.5