diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2016-09-20 16:47:30 -0400 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2016-09-20 16:47:30 -0400 |
| commit | 66238528eb83d99ea1930720b07e028a3d0ebee2 (patch) | |
| tree | e4d0f8fcf0516bb0f3ce70ed8e6c91735c344251 /src/leap/keymanager/_version.py | |
| parent | 3b20aa2e8e869556cd0a97c1e6d3404aadfd4526 (diff) | |
| parent | 52e4303cf2e0f8a51df33d3f8f30310ca5897069 (diff) | |
Merge tag '0.5.1' into debian/platform-0.9
Tag keymanager version 0.5.1
Diffstat (limited to 'src/leap/keymanager/_version.py')
| -rw-r--r-- | src/leap/keymanager/_version.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/keymanager/_version.py b/src/leap/keymanager/_version.py index 049099d..9c317fe 100644 --- a/src/leap/keymanager/_version.py +++ b/src/leap/keymanager/_version.py @@ -1,3 +1,4 @@ +<<<<<<< HEAD # This file was generated by the `freeze_debianver` command in setup.py # Using 'versioneer.py' (0.7+) from @@ -5,7 +6,7 @@ # unpacked source archive. Distribution tarballs contain a pre-generated copy # of this file. -version_version = '0.4.3' +version_version = '0.5.1' version_full = 'f17f8c43e217b65a951e5db357699c2d2af6098f' |