diff options
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 4 |
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, | |||
1248 | PB_X = 0, | 1248 | PB_X = 0, |
1249 | PB_Y, | 1249 | PB_Y, |
1250 | PB_WIDTH, | 1250 | PB_WIDTH, |
1251 | <<<<<<< .mine | ||
1252 | PB_HEIGHT, | 1251 | PB_HEIGHT, |
1253 | PB_FILENAME, | 1252 | PB_FILENAME, |
1254 | ======= | ||
1255 | PB_HEIGHT, | ||
1256 | >>>>>>> .r26726 | ||
1257 | }; | 1253 | }; |
1258 | const char *filename; | 1254 | const char *filename; |
1259 | int x, y, height, width; | 1255 | int x, y, height, width; |