Fixed xml

diff --git a/d-fuzz.py b/d-fuzz.py
index a3c1dae3ec89b27e7d160b9ca3b58b5a1f1547ad..e0ff3007ee1801b9bb87e6f860da54bce3c121ad 100755 (executable)
--- a/d-fuzz.py
+++ b/d-fuzz.py
@@ -16,7 +16,7 @@ import shout
 import string
 import random
 import subprocess
-from xmltodict import xmltodict
+from tools import xmltodict
 from mutagen.oggvorbis import OggVorbis
 
 

diff --git a/example/myfuzz.xml b/example/myfuzz.xml
index c4faea3d358d41947e62924a79ecc5d3877f5e97..2e0ff4328b1005679a694bcfc85fb2e9ea870b80 100644 (file)
--- a/example/myfuzz.xml
+++ b/example/myfuzz.xml
@@ -15,11 +15,7 @@
         <public>1</public>
     </server>
     <media>
-<<<<<<< .mine
-        <dir>/home/momo/music/mp3</dir>
-=======
-        <dir>/home/momo/data/data1/samples2/groovemasters/Groovemasters Drums/mp3</dir>
->>>>>>> .r12
+        <dir>/home/momo/music/mp3/groovemaster_drums</dir>
         <format>mp3</format>
         <bitrate>192</bitrate>
         <ogg_quality>7</ogg_quality>