From 772061eadf5179e41a8fe10f9b9ea14c72e707d2 Mon Sep 17 00:00:00 2001
From: Federico Campoli <rotellaro@gmail.com>
Date: Sun, 31 Jan 2021 16:45:22 +0100
Subject: [PATCH] remove spurious colon

---
 _index.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/_index.md b/_index.md
index 157d2cd..4e83e8a 100644
--- a/_index.md
+++ b/_index.md
@@ -4,11 +4,7 @@ themes:
 - Database engines
 website: https://www.postgresql.org/
 logo: stands/postgresql/logo.png
-<<<<<<< HEAD
-chat: postgresql
-=======
 chatroom: postgresql
->>>>>>> 9c813d904b58d6ad820ebaf2c7527b63b1a33ec1
 description: |
     <p>PostgreSQL is a powerful, open source object-relational database system 
     that uses and extends the SQL language combined with many features that safely 
@@ -34,7 +30,7 @@ description: |
 showcase: |
     <p>Come to our stand to meet the team behind PostgreSQL, get up to date with the latest developments, something you definitely do not want to miss!</p>
 
-    <h5>Check the schedule at the <a href="https://fosdem.org/2021/schedule/room/dpostgresql/" target="_blank">PostgreSQL Devroom</a>:</h5>
+    <h5>Check the schedule at the <a href="https://fosdem.org/2021/schedule/room/dpostgresql/" target="_blank">PostgreSQL Devroom</a></h5>
 
     
 
-- 
2.39.5