From 61138425e452ce8a4843713f403c21ec5d3c0825 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 2 Dec 2018 03:03:26 +0100
Subject: [PATCH] fix merge mistake

---
 src/villas-pipe.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/villas-pipe.cpp b/src/villas-pipe.cpp
index defc073f1..b6da8103f 100644
--- a/src/villas-pipe.cpp
+++ b/src/villas-pipe.cpp
@@ -354,12 +354,7 @@ check:		if (optarg == endptr)
 	if (!node)
 		throw RuntimeError("Node {} does not exist!", nodestr);
 
-<<<<<<< HEAD
 #ifdef LIBWEBSOCKETS_FOUND
-=======
-/** @todo Port to C++ */
-#ifdef __Libwebsockets_FOUND
->>>>>>> cpp: use new supernode class
 	/* Only start web subsystem if villas-pipe is used with a websocket node */
 	if (node_type(node)->start == websocket_start) {
 		Web *w = sn.getWeb();