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