From d9e6f00e25b9e2db4dbdec63932668e5e6e463ba Mon Sep 17 00:00:00 2001
From: Matt Strapp <strap012@umn.edu>
Date: Sun, 15 Nov 2020 18:40:17 -0600
Subject: Fix another one

---
 P3/server.c | 4 ----
 1 file changed, 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????)
-- 
cgit v1.2.3