1 files changed, 0 insertions, 4 deletions
diff --git a/P3/server.c b/P3/server.c
index a1d0527..323015a 100644
--- a/P3/server.c
+++ b/P3/server.c
@@ -215,10 +215,6 @@ int main(int argc, char **argv) {
     return -1;
   }
   // Initialize cache (extra credit B)
-<<<<<<< HEAD
-
-=======
->>>>>>> startmain
   // Start the server
   init(port);
   // Create dispatcher threads (make detachable????)