diff options
Diffstat (limited to 'firmware/target/hosted')
-rw-r--r-- | firmware/target/hosted/sdl/sim-ui-defines.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h index b237842711..0303ac8ca2 100644 --- a/firmware/target/hosted/sdl/sim-ui-defines.h +++ b/firmware/target/hosted/sdl/sim-ui-defines.h | |||
@@ -508,7 +508,6 @@ | |||
508 | #define UI_LCD_POSX 46 | 508 | #define UI_LCD_POSX 46 |
509 | #define UI_LCD_POSY 40 | 509 | #define UI_LCD_POSY 40 |
510 | 510 | ||
511 | <<<<<<< HEAD | ||
512 | #elif defined(SONY_NWZA860) | 511 | #elif defined(SONY_NWZA860) |
513 | #define UI_TITLE "Sony NWZ-A860 Series" | 512 | #define UI_TITLE "Sony NWZ-A860 Series" |
514 | #define UI_WIDTH 390 /* width of GUI window */ | 513 | #define UI_WIDTH 390 /* width of GUI window */ |