complete example, REALLY make Python 2/3 compatible

scienceopen · ybdarrenwang · commit c1c789bdf621 · 2016-08-14T17:26:03.000-07:00
diff --git a/README.rst b/README.rst
@@ -34,7 +34,11 @@ Supported features:
 - Log Filterbank Energies
 - Spectral Subband Centroids
 
+<<<<<<< 37663faa483cb9ec2eaaf37e752595e33e131f16
 `Example use <example.py>`_
+=======
+`Example use<example.py>`_
+>>>>>>> complete example, REALLY make Python 2/3 compatible
 
 From here you can write the features to a file etc.
 
@@ -102,4 +106,4 @@ Reference
 sample english.wav obtained from::
 
 	wget http://voyager.jpl.nasa.gov/spacecraft/audio/english.au
-	sox english.au -e signed-integer english.wav
+	sox english.au -e signed-integer english.wav
