fix conflicts

2017-01-21 11:02:17 +08:00
parent 330e7cb87b
commit c8550b86f0
2 changed files with 0 additions and 2 deletions
--- a/qemu/include/qemu-common.h
+++ b/qemu/include/qemu-common.h
@ -36,7 +36,6 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <assert.h>
-#include <signal.h>
 #include "glib_compat.h"

 #ifdef _WIN32