qemu-kvm: Remove merge artifact

Commit Message

Jan Kiszka Feb. 17, 2011, 2:30 p.m. UTC

None

Patch

diff --git a/kvm-stub.c b/kvm-stub.c
index caef9b4..fc2b810 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -137,7 +137,6 @@  int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr, uint32_t val, bool assign)
     return -ENOSYS;
 }
 
-<<<<<<< HEAD
 int kvm_has_gsi_routing(void)
 {
     return 0;