jenkins-bot submitted this change.

View Change

Merge branch 'master' into stable

Change-Id: I6d035c89bd2194d20633091104018649141737a8
---
M pywikibot/families/wikivoyage_family.py
2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/pywikibot/families/wikivoyage_family.py b/pywikibot/families/wikivoyage_family.py
index 91bf98b..61c4e8d 100644
--- a/pywikibot/families/wikivoyage_family.py
+++ b/pywikibot/families/wikivoyage_family.py
@@ -16,11 +16,7 @@
 
     languages_by_size = [
         'en', 'de', 'pl', 'it', 'fa', 'fr', 'ru', 'zh', 'nl', 'pt', 'es', 'he',
-<<<<<<< HEAD   (2ce061 Update git submodules)
-        'vi', 'fi', 'sv', 'el', 'uk', 'ro', 'bn', 'eo', 'ps', 'tr', 'hi', 'ja',
-=======
         'vi', 'fi', 'sv', 'el', 'uk', 'ro', 'bn', 'eo', 'tr', 'ps', 'ja', 'hi',
->>>>>>> BRANCH (f87f85 [6.0.1] Publish release 6.0.1)
     ]
 
     category_redirect_templates = {

To view, visit change 673685. To unsubscribe, or for help writing mail filters, visit settings.