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