1.5.0dev3

This commit is contained in:
Julien Duponchelle
2016-05-11 10:08:36 +02:00
parent a443e3dcde
commit bf9f782970
2 changed files with 3 additions and 1 deletions

2
.gitattributes vendored Normal file
View File

@@ -0,0 +1,2 @@
gns3/version.py merge=ours

View File

@@ -25,5 +25,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)