Merge branch 'master' into stable

Change-Id: I755b982d325edab0f40bd1a3eec245bc59e40a3d
---
M ROADMAP.rst
M pywikibot/__metadata__.py
3 files changed, 0 insertions(+), 27 deletions(-)

diff --git a/ROADMAP.rst b/ROADMAP.rst
index a319d0e..70acf3c 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -1,33 +1,10 @@
 Current release changes
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-<<<<<<< HEAD   (3644c4 Update git submodules)
-* Read correct object in SiteLinkCollection.normalizeData (T259426)
-* tools.count and tools classes Counter, OrderedDict and ContextManagerWrapper were removed
-* Deprecate UnicodeMixin and IteratorNextMixin
-* Restrict site module interface
-* EventStreams "since" parameter settings has been fixed
-* Unsupported debug and uploadByUrl parameters of UploadRobot were removed
-* Unported compat decode parameter of Page.title() has been removed
-* Wikihow family file was added (T249814)
-* Improve performance of CosmeticChangesToolkit.translateMagicWords
-* Prohibit positional arguments with Page.title()
-* Functions dealing with stars list were removed
-* Some pagegenerators functions were deprecated which should be replaced by site generators
-* LogEntry became a UserDict; all content can be accessed by its key
-* URLs for new toolforge.org domain were updated
-* pywikibot.__release__ was deprecated
-* Use one central point for framework version (T106121, T171886, T197936, T253719)
-* rvtoken parameter of Site.loadrevisions() and Page.revisions() has been dropped (T74763)
-* getFilesFromAnHash and getImagesFromAnHash Site methods have been removed
-* Site and Page methods deprecated for 10 years or longer have been removed
-* Support for Python 2 and 3.4 has been dropped (T213287, T239542)
-=======
 * APISite.loadpageinfo does not discard changes to page content when information was not loaded (T260472)
 * tools.UnicodeType and tools.signature are deprecated
 * BaseBot.stop() method is deprecated in favour of BaseBot.generator.close()
 * Escape bot password correctly (T259488)
->>>>>>> BRANCH (704c5e Merge "[4.1] publish current release")
 * Bugfixes and improvements
 * Localisation updates
 
diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py
index 4ec5802..aac3d66 100644
--- a/pywikibot/__metadata__.py
+++ b/pywikibot/__metadata__.py
@@ -6,11 +6,7 @@
 # Distributed under the terms of the MIT license.
 #
 __name__ = 'pywikibot'
-<<<<<<< HEAD   (3644c4 Update git submodules)
-__version__ = '4.0.0'
-=======
 __version__ = '4.1.0'
->>>>>>> BRANCH (704c5e Merge "[4.1] publish current release")
 __description__ = 'Python MediaWiki Bot Framework'
 __maintainer__ = 'The Pywikibot team'
 __maintainer_email__ = 'pywikibot@lists.wikimedia.org'

