.gitconfig: -# ChangeLog merge attempt

[nethome.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644 (file)
index d4e37a2..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-ChangeLog merge=git-merge-changelog