summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSOGYO\bvdoord <bvdoord@sogyo.nl>2021-02-22 11:31:34 +0100
committerSOGYO\bvdoord <bvdoord@sogyo.nl>2021-02-22 11:31:34 +0100
commita8a6802755ddcecfb60878dd33503b2b44c05b96 (patch)
treee23e8f559487af3e131756a288e4d6b4a99d24c3
parent1cdc1b34b25e8d689b55e41851761241d893b10e (diff)
Fixed readme error
-rw-r--r--README.md6
1 files changed, 0 insertions, 6 deletions
diff --git a/README.md b/README.md
index 78573f5..a060a9a 100644
--- a/README.md
+++ b/README.md
@@ -103,15 +103,9 @@ If you run the program, you will notice the build "progress" is stuck on 87% or
## Assignment
For the lecture, see [the drive](https://drive.google.com/drive/u/0/folders/1PvC-HS8ty3mdtSaNdR5rt5-GwL-5_LaY).
-<<<<<<< HEAD
The global goal is to make a web front-end to your mancala back-end. A stub has been made. In api/src/test you can find examples of how you can test the api endpoints.
-=======
-
-The global goal is to make a web front-end to your mancala back-end. A stub has been made. In api/src/test you can find examples of how you can test the api endpoints.
-
->>>>>>> 7b1b8a35db9699240b6c5243cd89ef0be7fd798a
- Familiarise yourself with the repository. Get the servers running and make sure you can connect to both servers. Enter two names in the boxes. You should see a "TODO" screen.
- Show the mancala game when it is started.
- If you want to use your own implementation, reference your implemenation in the `MancalaImpl` class.