Commit 1bb24039 authored by Sophie Wenzel-Teuber's avatar Sophie Wenzel-Teuber
Browse files

Resolve merge conflict

parent 139959fc
if(DEBUG)
add_compile_definitions(DEBUG)
endif(DEBUG)
<<<<<<< HEAD
add_subdirectory(fiphobo)
add_subdirectory(server)
=======
add_executable(
fiphoboserver
server/server.cc
server/static_handler.cc
server/push_request_handler.cc
fiphobo/fiphobo.cc
)
>>>>>>> 279c2d6582bd8d1a3a24f40bde21e5e5e7bfb284
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment