From 1f9ea375d972fa687f8f0a3267536597cf082a8a Mon Sep 17 00:00:00 2001
From: Xiaoxuan Li <x.li215@student.unimelb.edu.au>
Date: Mon, 29 Apr 2019 16:37:36 +1000
Subject: [PATCH] update makefile and image_tagger.c
---
Makefile | 4 ++--
image_tagger.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 417871e..12f56da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,2 @@
-test: test.c
- gcc -o test test.c
+image_tagger: image_tagger.c
+ gcc -o image_tagger image_tagger.c
diff --git a/image_tagger.c b/image_tagger.c
index b51441f..39467b1 100644
--- a/image_tagger.c
+++ b/image_tagger.c
@@ -76,7 +76,7 @@ static bool handle_http_request(int sockfd, int player)
while (*curr == '.' || *curr == '/')
++curr;
// assume the only valid request URI is "/" but it can be modified to accept more files
-<<<<<<< HEAD
+
if (strncmp(curr, "?start", 6) == 0){
--
GitLab