From 5385541def5c5ccd9ca2be7037307dfb6914ea90 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 10 Sep 2007 09:17:08 +0000
Subject: [PATCH] Created example dir

---
 myfuzz.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/myfuzz.xml b/myfuzz.xml
index 5056993..c4faea3 100644
--- 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>
-- 
2.39.5