X-Git-Url: http://rtime.felk.cvut.cz/gitweb/jailhouse.git/blobdiff_plain/ce53cd7ae673df5f176256a998ea7eb9c13088a4..12a85ea2c906621f02b190ee7dbec6ca34070e74:/configs/novabox.c

diff --git a/configs/novabox.c b/configs/novabox.c
index f9522b0..b4e8329 100644
--- a/configs/novabox.c
+++ b/configs/novabox.c
@@ -63,17 +63,12 @@ struct {
 			.mmconfig_base = 0xf8000000,
 			.mmconfig_end_bus = 0x3f,
 			.pm_timer_address = 0x408,
-<<<<<<< HEAD
+
 			 .iommu_base = {
 			 	0xfed90000,
 			 	0xfed91000,
 			 },
-=======
-			.iommu_base = {
-				0xfed90000,
-				0xfed91000,
-			},
->>>>>>> 11dff97feece0823144bbe800b9e56c6995cd2fb
+
 		},
 		.device_limit = 128,
 		.interrupt_limit = 256,