Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

fix merge mistake

Browse source
This commit is contained in:
Steffen Vogel 2018-12-02 03:03:26 +01:00
parent 71c6d5f9e5
commit 61138425e4
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/villas-pipe.cpp
View file

@ -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();