crappy editor and crappy svn missing crappy merge crappy crappy 2am crappy

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26728 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 0 insertions, 4 deletions

diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 561eb978a2..a2c4c6acc5 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -1248,12 +1248,8 @@ static int parse_progressbar(const char *wps_bufptr,
         PB_X = 0,
         PB_Y,
         PB_WIDTH,
-<<<<<<< .mine
         PB_HEIGHT,
         PB_FILENAME,
-=======
-        PB_HEIGHT,
->>>>>>> .r26726
     };
     const char *filename;
     int x, y, height, width;