Fixes error in setup.

froala · Sep 12, 2018 · d06b905 · d06b905
1 parent 90737e8
commit d06b905
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -2,11 +2,7 @@
 
 setup(
     name='django-froala-editor',
-<<<<<<< HEAD
     version='2.8.5',
-=======
-    version='2.8.4-2',
->>>>>>> 065a5b2f9f7e3e824725c9903ce58ca47ded1007
     author='Dipesh Acharya',
     author_email='[email protected]',
     maintainer='Froala Labs',