From 626eb20c0fe7c1378c4d050db89e04a0e8ac7c69 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 24 Oct 2008 19:03:52 +0100 Subject: [PATCH] Merge cleanup: delete some leftover junk from #includes --- hw/vga.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/vga.c b/hw/vga.c index 12906a850..68ea75c91 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -26,15 +26,13 @@ #include "pc.h" #include "pci.h" #include "vga_int.h" -//<<<<<<< HEAD/hw/vga.c + #include #include "sysemu.h" #include "qemu-xen.h" #include "exec-all.h" -//======= -//#include "pixel_ops.h" + #include "qemu-timer.h" -//>>>>>>> 3df1a17b0ab8a8be4e3c9d6b2fa0812c652520f1/hw/vga.c //#define DEBUG_VGA //#define DEBUG_VGA_MEM -- 2.39.5