diff --git a/README.md b/README.md index c1ce3c1d3c33d57066d0786dab24c70cd984bdb4..9a45c208d40bf5ca93950e612def88b7d72486f4 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