jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/786948 )
Change subject: [7.2] Merge branch 'master' into stable
......................................................................
[7.2] Merge branch 'master' into stable
Change-Id: I600d3298737781bff5511a6896f7f36f71eef4f9
---
M pywikibot/__metadata__.py
2 files changed, 0 insertions(+), 4 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py
index c321e36..a4fffeb 100644
--- a/pywikibot/__metadata__.py
+++ b/pywikibot/__metadata__.py
@@ -11,11 +11,7 @@
__name__ = 'pywikibot'
-<<<<<<< HEAD (87830c Update git submodules)
-__version__ = '7.1.1'
-=======
__version__ = '7.2.0'
->>>>>>> BRANCH (ccebd8 [7.2] Publish Pywikibot 7.2.0)
__description__ = 'Python MediaWiki Bot Framework'
__maintainer__ = 'The Pywikibot team'
__maintainer_email__ = 'pywikibot(a)lists.wikimedia.org'
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/786948
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: stable
Gerrit-Change-Id: I600d3298737781bff5511a6896f7f36f71eef4f9
Gerrit-Change-Number: 786948
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged