From 0f3f85631e5c6f9b4be1720eaebeb8450aa7d1c2 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 5 Sep 2012 13:49:06 +0200
Subject: [PATCH 1/1] remove extraneous sequel from merge

---
 planetlab/exp-tool/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile
index 54946d476..f3301e13c 100644
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@ -72,7 +72,6 @@ cache/host.%:
 	@host $(HOST_$*) | sed -n 's/^.*has address *//p' > $@
 
 cache/db.%:
-<<<<<<< HEAD
 	@echo "Starting db server on $(call display,$*)"
 	@$(SSH) $(HOST_$*) sudo start_ovsdb-server > $@ \
 	 || { rm $@; exit 1; }
-- 
2.43.0