From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 5 Sep 2012 11:49:06 +0000 (+0200)
Subject: remove extraneous sequel from merge
X-Git-Tag: sliver-openvswitch-1.8.90-0~46
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=0f3f85631e5c6f9b4be1720eaebeb8450aa7d1c2;p=sliver-openvswitch.git

remove extraneous sequel from merge
---

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; }