emulator: remove conflicts in qemu-options

remove conflicts in qemu-options

Change-Id: Ic38e2af2884cfa33f46d6870c9ed5dc84d8b744b
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/qemu-options.hx b/qemu-options.hx
index 5799d97d0c206dcc5369487cfbc5164b815efb0a..942baac8e2583231ebbaab5d743e5da62ad5ee7c 100644 (file)
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3076,7 +3076,6 @@ the @var{simple} tracing backend.
 @end table
 ETEXI
 
-<<<<<<< HEAD
 DEF("max-touch-point", HAS_ARG, QEMU_OPTION_max_touch_point, \
     "-max-touch-point [count]\n"
     "                define maximum number of touch point\n",
@@ -3096,18 +3095,9 @@ STEXI
 @findex -disable-skin
 ETEXI
 
-DEF("qtest", HAS_ARG, QEMU_OPTION_qtest,
-    "-qtest CHR      specify tracing options\n",
-    QEMU_ARCH_ALL)
-
-DEF("qtest-log", HAS_ARG, QEMU_OPTION_qtest_log,
-    "-qtest-log LOG  specify tracing options\n",
-    QEMU_ARCH_ALL)
-=======
 HXCOMM Internal use
 DEF("qtest", HAS_ARG, QEMU_OPTION_qtest, "", QEMU_ARCH_ALL)
 DEF("qtest-log", HAS_ARG, QEMU_OPTION_qtest_log, "", QEMU_ARCH_ALL)
->>>>>>> test1.5
 
 #ifdef __linux__
 DEF("enable-fips", 0, QEMU_OPTION_enablefips,