message: Remove merge conflict markers on Projects page
diff: @@ -11,11 +11,8 @@ submit a PR, please!
  * <https://github.com/aprokurov/spaceshooter>
  * <https://github.com/ozkriff/zemeroth>
  * <https://github.com/Swampsoft/solitaire>
  -<<<<<<< HEAD
  * <https://github.com/obsoke/rustris>
  -=======
  * <https://github.com/icefoxen/ld42/>
  ->>>>>>> devel
  # Examples/tutorial code
  @@ -35,12 +32,8 @@ submit a PR, please!
  ## Games
  -<<<<<<< HEAD
  - * <https://rap2hpoutre.github.io/llamassacre-website/>
  -=======
  * <https://github.com/obsoke/rustris>
  * <https://rap2hpoutre.github.io/llamassacre-website/>
  ->>>>>>> devel
  ## Examples/tutorial code
  