Skip to content

Commit

Permalink
1.5.0dev3
Browse files Browse the repository at this point in the history
  • Loading branch information
julien-duponchelle committed May 11, 2016
1 parent a443e3d commit bf9f782
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
gns3/version.py merge=ours

2 changes: 1 addition & 1 deletion gns3/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
number has been incremented)
"""

__version__ = "1.5.0a2"
__version__ = "1.5.0dev3"
__version_info__ = (1, 5, 0, -99)

0 comments on commit bf9f782

Please sign in to comment.