Commit b292742f authored by Andreas Schmidt's avatar Andreas Schmidt
Browse files

Fix merge error.

parent b725a254

prrt/proto/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ set (PRRT_SOURCES ../defines.h 
        receiver.c receiver.h

        socket.c socket.h

		timer.c timer.h

        ../xlap/xlap.c ../xlap/xlap.h

        applicationConstraints.c applicationConstraints.h

        processes/dataReceiver.c processes/dataReceiver.h

        processes/dataTransmitter.c processes/dataTransmitter.h