Merge branch 'master' of https://github.com/python-sprints/python-sprints.github.io into event-200323

Author: Cheukting

Gemfile.lock

@@ -205,7 +205,7 @@ GEM
       jekyll-seo-tag (~> 2.1)
     minitest (5.11.3)
     multipart-post (2.1.1)
-    nokogiri (1.10.5)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -219,7 +219,7 @@ GEM
     ruby-enum (0.7.2)
       i18n
     ruby_dep (1.5.0)
-    rubyzip (1.2.3)
+    rubyzip (2.2.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)

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

@@ -14,7 +14,11 @@ 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
 
 ------------------
 
@@ -59,17 +63,27 @@ 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
 ---------------