From aff834f565d6524cad0f1d9091d159adf66e40ca Mon Sep 17 00:00:00 2001
From: Julien Duponchelle <julien@duponchelle.info>
Date: Fri, 16 Jan 2015 10:18:02 +0100
Subject: [PATCH] Oops bad merge

---
 gns3server/version.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/gns3server/version.py b/gns3server/version.py
index 80e9e442..ed60edd9 100644
--- a/gns3server/version.py
+++ b/gns3server/version.py
@@ -15,10 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-<<<<<<< HEAD
-__version__ = "1.3.dev1"
-__version_info__ = (1, 3, 0, 0)
-=======
 # __version__ is a human-readable version number.
 
 # __version_info__ is a four-tuple for programmatic comparison. The first
@@ -27,6 +23,6 @@ __version_info__ = (1, 3, 0, 0)
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "1.2.2"
-__version_info__ = (1, 2, 2, 0)
->>>>>>> origin/master
+__version__ = "1.3.dev1"
+__version_info__ = (1, 3, 0, 0)
+