jenkins-bot has submitted this change. ( 
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026708?usp=email )

Change subject: Merge branch 'master' into stable
......................................................................

Merge branch 'master' into stable

Change-Id: I41f97108af8d0eb554d57766e14bfdb52c56d862
---
M scripts/__init__.py
2 files changed, 30 insertions(+), 4 deletions(-)

Approvals:
  jenkins-bot: Verified
  Xqt: Looks good to me, approved




diff --git a/scripts/__init__.py b/scripts/__init__.py
index af4197d..13b4564 100644
--- a/scripts/__init__.py
+++ b/scripts/__init__.py
@@ -32,8 +32,4 @@
 #
 # Distributed under the terms of the MIT license.
 #
-<<<<<<< HEAD   (fdb76b Update git submodules)
-__version__ = '9.1.1'
-=======
 __version__ = '9.1.2'
->>>>>>> BRANCH (cc9abc [9.1.2] Publish Pywikibot 9.1.2)

--
To view, visit 
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1026708?usp=email
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: I41f97108af8d0eb554d57766e14bfdb52c56d862
Gerrit-Change-Number: 1026708
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <i...@gno.de>
Gerrit-Reviewer: D3r1ck01 <dalangi-...@wikimedia.org>
Gerrit-Reviewer: Xqt <i...@gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list -- pywikibot-commits@lists.wikimedia.org
To unsubscribe send an email to pywikibot-commits-le...@lists.wikimedia.org

Reply via email to