Fixed merge problems

Lobosque · Lobosque · commit eefd62f910b3 · 2016-11-16T19:11:22.000-02:00
diff --git a/setup.cfg b/setup.cfg
@@ -1,9 +1,5 @@
 [bumpversion]
-<<<<<<< HEAD
-current_version = 0.2.0
-=======
 current_version = 0.2.1
->>>>>>> release/0.2.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
@@ -19,11 +19,7 @@
 
 setup(
     name='python_wpapi',
-<<<<<<< HEAD
-    version='0.2.0',
-=======
     version='0.2.1',
->>>>>>> release/0.2.1
     description="Simple wrapper around the Wordpress REST API",
     long_description=readme + '\n\n' + history,
     author="Lucas Lobosque",
