Version Change

ezrafielding · Jun 11, 2019 · d8de60c · d8de60c
1 parent 3ff40e1
commit d8de60c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/easytello/__init__.py b/easytello/__init__.py
@@ -2,11 +2,7 @@
 __author__ = 'Ezra Fielding'
 __liscence__ = 'MIT'
 __copyright__ = 'Copyright 2019 Ezra Fielding'
-<<<<<<< HEAD
-__version__ = '0.0.6'
-=======
 __version__ = '0.0.7'
->>>>>>> develop
 __all__ = ['tello', 'stats']
 
 from .tello import Tello

diff --git a/setup.py b/setup.py
@@ -5,11 +5,7 @@
 
 setuptools.setup(
     name='easytello',
-<<<<<<< HEAD
-    version='0.0.6',
-=======
     version='0.0.7',
->>>>>>> develop
     author='Ezra Fielding',
     author_email='ezra.fielding@gmail.com',
     description='An easy framework to support DJI Tello scripting in Python 3',