1 files changed, 1 insertions, 9 deletions
diff --git a/muggle.c b/muggle.c
index 2adebbb..14ff37b 100644
--- a/muggle.c
+++ b/muggle.c
@@ -22,15 +22,7 @@
 #include <getopt.h>
 #include <config.h>
 
-<<<<<<< .mine
-<<<<<<< .mine
-static const char *VERSION        = "0.0.3";
-=======
-static const char *VERSION        = "0.0.4";
-=======
-static const char *VERSION        = "0.0.5";
->>>>>>> .r202
->>>>>>> .r177
+static const char *VERSION        = "0.0.6";
 static const char *DESCRIPTION    = "Media juggle plugin for VDR";
 static const char *MAINMENUENTRY  = "Muggle";