From 61ee2b9172a10c3f0e483b90a0947fd54f3e989f Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@icir.org>
Date: Wed, 11 Dec 2013 20:55:17 -0800
Subject: [PATCH] Fixing rebase relicts.

---
 src/CMakeLists.txt | 3 ---
 src/Net.h          | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1aede44934..516426ea02 100644
--- a/src/CMakeLists.txt
+++ b/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
diff --git a/src/Net.h b/src/Net.h
index 421bee5911..b9320181f9 100644
--- a/src/Net.h
+++ b/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"