FIx merge conflicts

Co-authored-by: Hannah Gooding <[email protected]>
fac19 · May 28, 2020 · e7b7ef9 · e7b7ef9
2 parents b7b7cc2 + 6e6d2f2
commit e7b7ef9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -147,7 +147,12 @@ Request body example:
 
 ##### GET /project/:projectid
 
+<<<<<<< HEAD
 Get a project by its id
+=======
+Get a project by project id
+
+> > > > > > > master
 
 ##### GET /followedprojects