From e769a56ef78866fbc50713941f5c3b5a084311aa Mon Sep 17 00:00:00 2001 From: yomguy Date: Fri, 28 Oct 2011 14:35:47 +0200 Subject: [PATCH] fix ignore files --- telemeta/pages/.gitattributes | 2 ++ telemeta/pages/en/.gitattributes | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 telemeta/pages/.gitattributes delete mode 100644 telemeta/pages/en/.gitattributes diff --git a/telemeta/pages/.gitattributes b/telemeta/pages/.gitattributes new file mode 100644 index 00000000..4da71dfd --- /dev/null +++ b/telemeta/pages/.gitattributes @@ -0,0 +1,2 @@ +*.rst merge=ours + diff --git a/telemeta/pages/en/.gitattributes b/telemeta/pages/en/.gitattributes deleted file mode 100644 index a84e433c..00000000 --- a/telemeta/pages/en/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -*.rst - -- 2.39.5