From 8039f4c760760a5babd888a5035bda846b468660 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 27 Oct 2011 14:32:15 +0200 Subject: [PATCH] fix ignore --- telemeta/pages/en/.gitattributes | 3 +-- telemeta/pages/fr/.gitattributes | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/telemeta/pages/en/.gitattributes b/telemeta/pages/en/.gitattributes index ea967284..87e781d3 100644 --- a/telemeta/pages/en/.gitattributes +++ b/telemeta/pages/en/.gitattributes @@ -1,2 +1 @@ -home.rst merge=ours -legal_notices.rst merge:ours +home.rst legal_notices.rst merge=ours diff --git a/telemeta/pages/fr/.gitattributes b/telemeta/pages/fr/.gitattributes index ea967284..87e781d3 100644 --- a/telemeta/pages/fr/.gitattributes +++ b/telemeta/pages/fr/.gitattributes @@ -1,2 +1 @@ -home.rst merge=ours -legal_notices.rst merge:ours +home.rst legal_notices.rst merge=ours -- 2.39.5