From db73f0f7c7ef94dd309cc42e10c09ad92c1561d8 Mon Sep 17 00:00:00 2001 From: yomguy Date: Fri, 28 Oct 2011 14:11:04 +0200 Subject: [PATCH] fix got ignore --- en/.gitattributes | 2 +- fr/.gitattributes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/en/.gitattributes b/en/.gitattributes index a831bc5..a84e433 100644 --- a/en/.gitattributes +++ b/en/.gitattributes @@ -1,2 +1,2 @@ -home.rst legal_notices.rst merge=ours +*.rst diff --git a/fr/.gitattributes b/fr/.gitattributes index a831bc5..a84e433 100644 --- a/fr/.gitattributes +++ b/fr/.gitattributes @@ -1,2 +1,2 @@ -home.rst legal_notices.rst merge=ours +*.rst -- 2.39.5