diff options
Diffstat (limited to 'firmware/target/hosted/sdl')
| -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 @@ #define UI_LCD_POSX 46 #define UI_LCD_POSY 40 -<<<<<<< HEAD #elif defined(SONY_NWZA860) #define UI_TITLE "Sony NWZ-A860 Series" #define UI_WIDTH 390 /* width of GUI window */ |