From 091fb03e7987b1dbab211a37fb9730ff57f58e5e Mon Sep 17 00:00:00 2001
From: Mengxi Lei <leim5@mcmaster.ca>
Date: Wed, 22 Jan 2020 15:51:13 -0500
Subject: [PATCH] Update README.md

---
 README.md | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index c1ce3c1..9a45c20 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,16 @@
 # Project Name
 
-<<<<<<< HEAD
 Team Name: Undetermined
 
 Team Members:
 
-Andrew Hum | huma3
+    Andrew Hum | huma3
 
-William Lei | leim5
+    William Lei | leim5
 
-Arshan Khan | khana172
+    Arshan Khan | khana172
 
-Jame Tran | tranj52
+    Jame Tran | tranj52
 
 
 
@@ -29,5 +28,4 @@ When working, do not directly make change to master branch.
 
 Branch off master and then later merge back to master branch.
 
-Do not merge codes that does not functions fully to master branch.
->>>>>>> ab174bc813933281ee54ff8767b6c763e0011a18
+Do not merge codes that does not functions fully to master branch.
\ No newline at end of file
-- 
GitLab