Fix merge conflict

csala · csala · commit c0102f3139f1 · 2021-11-15T16:30:32.000+01:00
diff --git a/deepecho/__init__.py b/deepecho/__init__.py
@@ -2,11 +2,8 @@
 
 __author__ = 'MIT Data To AI Lab'
 __email__ = 'dailabmit@gmail.com'
-<<<<<<< HEAD
-__version__ = '0.2.1'
-=======
 __version__ = '0.3.0'
->>>>>>> master
+
 __path__ = __import__('pkgutil').extend_path(__path__, __name__)
 
 from deepecho.demo import load_demo
