From 5d6b0fc6878b305dffdd80388a7ca6444e3e8058 Mon Sep 17 00:00:00 2001
From: seanpringle <sean.pringle@gmail.com>
Date: Thu, 25 Oct 2012 02:05:48 +1000
Subject: [PATCH] protect config.h

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

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