Update Readme.md

Termininja · Sep 17, 2017 · b260cad · b260cad
1 parent b351dd6
commit b260cad
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/Readme.md b/Readme.md
@@ -5,12 +5,9 @@ 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:
+Wikidata abilities:
  * 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***