arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Oops bad merge

Browse Source
This commit is contained in:
Julien Duponchelle 2015-01-16 10:18:02 +01:00
parent 7a767a6b92
commit aff834f565
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gns3server/version.py
View File

@ -15,10 +15,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # 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__ is a human-readable version number.
# __version_info__ is a four-tuple for programmatic comparison. The first # __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 # or negative for a release candidate or beta (after the base version
# number has been incremented) # number has been incremented)
__version__ = "1.2.2" __version__ = "1.3.dev1"
__version_info__ = (1, 2, 2, 0) __version_info__ = (1, 3, 0, 0)
>>>>>>> origin/master