From cf3a957881a1375dcf83bda2e655c428d6600900 Mon Sep 17 00:00:00 2001
From: seanpringle <sean.pringle@gmail.com>
Date: Mon, 29 Oct 2012 07:06:35 +1000
Subject: [PATCH] use .git/info/attributes

---
 .gitattributes | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 5f327fd..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-config.h merge=ours