X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=8742ff6bd0017f54574c0eb7cbf17bec52a3ce23;hb=107d8f06c7083f58fc96d781efb0226edd82c7d9;hp=620761a64f98c2e861a90534f7a66e62b0cbe30d;hpb=ee8666572bea1a9628d96ebc3e4d97f84b357134;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 620761a..8742ff6 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -214,10 +214,6 @@ struct guest_info;
 
 #endif
 
-<<<<<<< HEAD:palacios/include/palacios/vmm.h
-
-=======
->>>>>>> 0956466aad020813d1e470df366d552fdabab2a9:palacios/include/palacios/vmm.h
 /* ** */