Merge Errors

- Fixed errors from merge mistakes.
2014-01-07 19:23:54 -05:00
parent 98f740e9d1
commit 9c41610f56
4 changed files with 12 additions and 12 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,7 +28,6 @@ set (task_SRCS A3.cpp A3.h
               OldDuration.cpp OldDuration.h
               Path.cpp Path.h
               RX.cpp RX.h
-               Socket.cpp Socket.h
               TDB2.cpp TDB2.h
               Task.cpp Task.h
               Taskmod.cpp Taskmod.h