summaryrefslogtreecommitdiff
path: root/src/leap/keymanager/_version.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/keymanager/_version.py')
-rw-r--r--src/leap/keymanager/_version.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/keymanager/_version.py b/src/leap/keymanager/_version.py
index 9c317fe..b87befd 100644
--- a/src/leap/keymanager/_version.py
+++ b/src/leap/keymanager/_version.py
@@ -1,14 +1,14 @@
-<<<<<<< HEAD
# This file was generated by the `freeze_debianver` command in setup.py
-# Using 'versioneer.py' (0.7+) from
+# Using 'versioneer.py' (0.16) from
# revision-control system data, or from the parent directory name of an
# unpacked source archive. Distribution tarballs contain a pre-generated copy
# of this file.
version_version = '0.5.1'
-version_full = 'f17f8c43e217b65a951e5db357699c2d2af6098f'
+full_revisionid = '66238528eb83d99ea1930720b07e028a3d0ebee2'
def get_versions(default={}, verbose=False):
- return {'version': version_version, 'full': version_full}
+ return {'version': version_version,
+ 'full-revisionid': full_revisionid}