From a1bf9cdfd35712d5be8d7632e01c9e17715d3bc0 Mon Sep 17 00:00:00 2001
From: Julien Duponchelle <julien@duponchelle.info>
Date: Wed, 11 May 2016 10:06:21 +0200
Subject: [PATCH] Keep the version.py untouched when merging

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..953bd7d6
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+gns3server/version.py merge=ours
+