Moved XML example

diff --git a/example/myfuzz.xml b/example/myfuzz.xml
new file mode 100644 (file)
index 0000000..c4faea3
--- /dev/null
+++ b/example/myfuzz.xml
@@ -0,0 +1,32 @@
+<station>
+    <infos>
+        <short_name>Cellar_Playlist</short_name>
+        <name>Cellar @ D-Fuzz, Paris (100% Mix Techno, House and Groove !)</name>
+        <description>The Best Techno, House and Groove Stuff from Paris - 100% Mix !</description>
+        <url>http://cellar.parisson.com</url>
+        <genre>Techno/House</genre>
+        <channels>2</channels>
+    </infos>
+    <server>
+        <host>localhost</host>
+        <port>8000</port>
+        <mountpoint>/d-fuzz_1.mp3</mountpoint>
+        <sourcepassword>source2parisson</sourcepassword>
+        <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>
+        <samplerate>44100</samplerate>
+        <voices>2</voices>
+        <shuffle>1</shuffle>
+    </media>
+</station>
+
+

diff --git a/myfuzz.xml b/myfuzz.xml
deleted file mode 100644 (file)
index c4faea3..0000000
--- a/myfuzz.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<station>
-    <infos>
-        <short_name>Cellar_Playlist</short_name>
-        <name>Cellar @ D-Fuzz, Paris (100% Mix Techno, House and Groove !)</name>
-        <description>The Best Techno, House and Groove Stuff from Paris - 100% Mix !</description>
-        <url>http://cellar.parisson.com</url>
-        <genre>Techno/House</genre>
-        <channels>2</channels>
-    </infos>
-    <server>
-        <host>localhost</host>
-        <port>8000</port>
-        <mountpoint>/d-fuzz_1.mp3</mountpoint>
-        <sourcepassword>source2parisson</sourcepassword>
-        <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>
-        <samplerate>44100</samplerate>
-        <voices>2</voices>
-        <shuffle>1</shuffle>
-    </media>
-</station>
-
-