From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Fri, 24 Oct 2008 18:03:52 +0000 (+0100)
Subject: Merge cleanup: delete some leftover junk from #includes
X-Git-Tag: t.master-before-merge~62
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=626eb20c0fe7c1378c4d050db89e04a0e8ac7c69;p=qemu-xen-3.4-testing.git

Merge cleanup: delete some leftover junk from #includes
---

diff --git a/hw/vga.c b/hw/vga.c
index 12906a85..68ea75c9 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 <sys/mman.h>
 #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