From e7d846fedafdbac1b72065cf9387f4c7db76800a Mon Sep 17 00:00:00 2001
From: Makis Tracend <makis.tracend@gmail.com>
Date: Fri, 15 Nov 2013 03:15:37 -0800
Subject: [PATCH] #119 defining how .sqlite files are diff/merged (if needed)

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..d9a40c6
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.sqlite diff=sqlite3 merge=sqlite3
\ No newline at end of file