remove extraneous sequel from merge

diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile
index 54946d4..f3301e1 100644 (file)
--- 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; }