Merge pull request #199 from Cheukting/event-200323

Why it is changed?

Author: Cheukting

_posts/2020-03-23-terminusdb-doc-sprint.md

@@ -14,11 +14,7 @@ sponsor: decibel
 
 As the situation evolved and we have the safety of the participants in mind, this sprint will be FULL REMOTE.
 
-<<<<<<< HEAD
 Just join the [Zoom](https://zoom.us/j/882305838) for participation and [Discord server](https://discord.gg/kfsVBB6) for chat and collaboration.
-=======
-Just join the [Zoom](https://zoom.us/j/882305838) for participation and [Discord server](https://discord.gg/JJM5S2x) for chat and collaboration.
->>>>>>> 2c50c76a51f39c79bc2311af3620d54d0cd56843
 
 ------------------
 
@@ -63,27 +59,17 @@ Agenda **Revised**
 ------
 
 - 6:30pm: Community announcements, project presentations and team creation (Zoom streaming starts here https://zoom.us/j/882305838)
-<<<<<<< HEAD
 - 7:00pm: Coding (Join Discord server for collaborating: https://discord.gg/kfsVBB6)
-=======
-- 7:00pm: Coding (Join Discord server for collaborating: https://discord.gg/JJM5S2x)
->>>>>>> 2c50c76a51f39c79bc2311af3620d54d0cd56843
 - 8:45pm: Group presentations (Re-group at zoom meeting: [https://zoom.us/j/954512731](https://zoom.us/j/954512731))
 - 9pm: End of the event, no pub, stay at home for safety
 
 
 To prepare for the sprint
 ---------------------
 
-<<<<<<< HEAD
 - Register for Zoom account (optional) and familiarise yourself with Zoom.
 - Join the [Discord server](https://discord.gg/kfsVBB6) of the sprint and familiarise yourself with Discord
 - Join the [Telegram group](https://t.me/py_sprints) for the update and community news of Python Sprint (optional)
-=======
-- Bring your own laptop if you can
-- Join the [Discord server](https://discord.gg/JJM5S2x) of the sprint
-- Join the [Telegram group](https://t.me/py_sprints) for the update and community news of Python Sprint
->>>>>>> 2c50c76a51f39c79bc2311af3620d54d0cd56843
 
 Code of Conduct
 ---------------