qemu-kvm: Remove merge artifact

PATCH New Jan Kiszka 1 participant 1 message Feb 17, 2011 KVM

lore

Share & tools

lore

Jan Kiszka

author

2011-02-17 14:30 UTC #0 lore raw

PATCH 1/1 qemu-kvm: Remove merge artifact

Signed-off-by Jan Kiszka <[email protected]>

---
 kvm-stub.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

kvm-stub.c +0 -1

index caef9b4..fc2b810 100644
@@ -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;

Signature · 1 line

1.7.1