From 210881ca35df0f05a11c2cf88cd73ddab18cff1d Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Sun, 29 Jul 2018 12:23:28 -0400 Subject: Remove leftover merge conflict marker Change-Id: Ie34657fe652d3613429d3fa233faac9608a8b826 --- firmware/target/hosted/sdl/sim-ui-defines.h | 1 - 1 file changed, 1 deletion(-) (limited to 'firmware/target/hosted') 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 */ -- cgit v1.2.3