len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove leftover merge conflict marker

Browse source 
Change-Id: Ie34657fe652d3613429d3fa233faac9608a8b826
This commit is contained in:
Franklin Wei 2018-07-29 12:23:28 -04:00
parent e9bdb4b028
commit 210881ca35
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
firmware/target/hosted/sdl/sim-ui-defines.h
View file

@ -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 */