From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 10 Sep 2007 10:01:05 +0000 (+0000)
Subject: Fixed xml
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=867b7ca28be2fb6bc5ec3acdd8c8b8d786acbc45;p=deefuzzer.git

Fixed xml
---

diff --git a/d-fuzz.py b/d-fuzz.py
index a3c1dae..e0ff300 100755
--- 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 c4faea3..2e0ff43 100644
--- 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>