Fixing rebase relicts.

src/CMakeLists.txt

@@ -151,7 +151,6 @@ list(APPEND BINPAC_OUTPUTS "${BINPAC_OUTPUT_CC}")
 set(bro_SUBDIR_LIBS CACHE INTERNAL "subdir libraries" FORCE)
 set(bro_PLUGIN_LIBS CACHE INTERNAL "plugin libraries" FORCE)
 
-add_subdirectory(iosource)
 add_subdirectory(analyzer)
 add_subdirectory(file_analysis)
 add_subdirectory(probabilistic)
@@ -251,8 +250,6 @@ set(bro_SRCS
     Anon.cc
     Attr.cc
     Base64.cc
-    BroDoc.cc
-    BroDocObj.cc
     Brofiler.cc
     BroString.cc
     CCL.cc

src/Net.h

@@ -4,11 +4,7 @@
 #define net_h
 
 #include "net_util.h"
-<<<<<<< HEAD
 #include "util.h"
-#include "BPF_Program.h"
-=======
->>>>>>> 5493253... Checkpoint.
 #include "List.h"
 #include "FlowSrc.h"
 #include "Func.h"