From f414ce459a1091fac7d6ff7c98d7f16b70318aa8 Mon Sep 17 00:00:00 2001
From: Julien Duponchelle <julien@duponchelle.info>
Date: Wed, 11 May 2016 10:03:03 +0200
Subject: [PATCH 1/2] 1.5.0dev3

---
 gns3server/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gns3server/version.py b/gns3server/version.py
index e0297eea..21ff02ff 100644
--- a/gns3server/version.py
+++ b/gns3server/version.py
@@ -23,5 +23,5 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "1.5.0a2"
+__version__ = "1.5.0dev3"
 __version_info__ = (1, 5, 0, -99)

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 2/2] 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
+