luoluyao
diff --git a/Collapse file
‎python_speech_features/base.py‎
Copy file name to clipboardExpand all lines: python_speech_features/base.py
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎python_speech_features/base.py‎
Copy file name to clipboardExpand all lines: python_speech_features/base.py
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎setup.py‎
Copy file name to clipboardExpand all lines: setup.py
+4Lines changed: 4 additions & 0 deletions b/Collapse file
‎setup.py‎
Copy file name to clipboardExpand all lines: setup.py
+4Lines changed: 4 additions & 0 deletions
@@ -171,7 +171,7 @@ def lifter(cepstra, L=22):
     else:
         # values of L <= 0, do nothing
         return cepstra
-    
+
 def delta(feat, N):
     """Compute delta features from a feature vector sequence.
 
 
@@ -4,7 +4,11 @@
     from distutils.core import setup
 
 setup(name='python_speech_features',
+<<<<<<< 475e99f610f38fc3dfc8361f5bc21cf8c1dfd6f3
       version='0.4',
+=======
+      version='0.2',
+>>>>>>> changed naming for pypi release
       description='Python Speech Feature extraction',
       author='James Lyons',
       author_email='james.lyons0@gmail.com',