jenkins-bot submitted this change.

View Change

Merge branch 'master' into stable

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

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 change 1026708. To unsubscribe, or for help writing mail filters, visit settings.