1 files changed, 8 insertions, 0 deletions
diff --git a/muggle.c b/muggle.c
index 849e3eb..2adebbb 100644
--- a/muggle.c
+++ b/muggle.c
@@ -22,7 +22,15 @@
 #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 *DESCRIPTION    = "Media juggle plugin for VDR";
 static const char *MAINMENUENTRY  = "Muggle";