From 86b386998055fd79b1d2eef83c892f9ec2bb9780 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Thu, 18 Feb 2016 20:38:22 -0800 Subject: [PATCH] Remove old mapmerge driver --- .gitattributes | 1 - .gitconfig | 5 ----- 2 files changed, 6 deletions(-) delete mode 100644 .gitattributes delete mode 100644 .gitconfig diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 8a313292bb1..00000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.dmm merge=merge-dmm diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index de5ff6f2542..00000000000 --- a/.gitconfig +++ /dev/null @@ -1,5 +0,0 @@ -[merge "merge-dmm"] - name = mapmerge driver - driver = ./mapmerge.sh %O %A %B - recursive = text -