Created example dir

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