John Vandenberg has submitted this change and it was merged.
Change subject: Merge release '0.9.1'
......................................................................
Merge release '0.9.1'
Conflicts:
setup.py
Change-Id: I0ddd932d9251d29094ffbc15eb56044d93f9ac9d
---
M setup.py
1 file changed, 1 insertion(+), 5 deletions(-)
Approvals:
John Vandenberg: Verified; Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
diff --git a/setup.py b/setup.py
index d33bc3e..e4416cc 100755
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,7 @@
import sys
pkgdir = {'': 'python%s' % sys.version_info[0]}
-<<<<<<< HEAD (ada7d1 PEP 440 version scheme)
-VERSION = '0.9+pywikibot2'
-=======
-VERSION = '0.9.1'
->>>>>>> BRANCH (f9f797 0.9.1 Release changes.)
+VERSION = '0.9.1+pywikibot1'
setup(name='httplib2',
version=VERSION,
--
To view, visit https://gerrit.wikimedia.org/r/203624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ddd932d9251d29094ffbc15eb56044d93f9ac9d
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/externals/httplib2
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
