diff options
| author | Matt Strapp <strap012@umn.edu> | 2020-11-15 18:40:17 -0600 |
|---|---|---|
| committer | Matt Strapp <strap012@umn.edu> | 2020-11-15 18:40:17 -0600 |
| commit | d9e6f00e25b9e2db4dbdec63932668e5e6e463ba (patch) | |
| tree | 1d8699e5d1f9f9fe96b4b808fdac5f1a33c51ddd /P3/server.c | |
| parent | Fix merge conflict (diff) | |
| download | csci4061-d9e6f00e25b9e2db4dbdec63932668e5e6e463ba.tar csci4061-d9e6f00e25b9e2db4dbdec63932668e5e6e463ba.tar.gz csci4061-d9e6f00e25b9e2db4dbdec63932668e5e6e463ba.tar.bz2 csci4061-d9e6f00e25b9e2db4dbdec63932668e5e6e463ba.tar.lz csci4061-d9e6f00e25b9e2db4dbdec63932668e5e6e463ba.tar.xz csci4061-d9e6f00e25b9e2db4dbdec63932668e5e6e463ba.tar.zst csci4061-d9e6f00e25b9e2db4dbdec63932668e5e6e463ba.zip | |
Fix another one
Diffstat (limited to 'P3/server.c')
| -rw-r--r-- | P3/server.c | 4 |
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????) |