Merge remote-tracking branch 'origin/master'

# Conflicts: # Readme.md
Termininja · Sep 17, 2017 · b351dd6 · b351dd6
2 parents 0c8e967 + 80a7ec6
commit b351dd6
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Readme.md b/Readme.md
@@ -5,9 +5,12 @@ WikiBot
 
 It supports creation, moving, deletion and editing of articles, talk pages, items, templates and categories, reverting edits and transferring of information between the projects. 
 
+<<<<<<< HEAD
 Wikidata:
  * creation and merger of items
  * adding, changing and removing of site links, labels, descriptions and aliases
  * adding and removing of all kinds of statements, properties, qualifiers and references
 
+=======
+>>>>>>> origin/master
 ***...in development***