summaryrefslogtreecommitdiffstats
path: root/firmware/target
diff options
context:
space:
mode:
authorFranklin Wei <git@fwei.tk>2018-07-29 12:23:28 -0400
committerFranklin Wei <git@fwei.tk>2018-07-29 12:23:28 -0400
commit210881ca35df0f05a11c2cf88cd73ddab18cff1d (patch)
tree1aada120ac10545e7fde4cab15fc97df104a4623 /firmware/target
parente9bdb4b0281ad9b4a58526f212f1cbbecb49e91a (diff)
downloadrockbox-210881ca35df0f05a11c2cf88cd73ddab18cff1d.tar.gz
rockbox-210881ca35df0f05a11c2cf88cd73ddab18cff1d.tar.bz2
rockbox-210881ca35df0f05a11c2cf88cd73ddab18cff1d.zip
Remove leftover merge conflict marker
Change-Id: Ie34657fe652d3613429d3fa233faac9608a8b826
Diffstat (limited to 'firmware/target')
-rw-r--r--firmware/target/hosted/sdl/sim-ui-defines.h1
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 */