From 0d05e254cec371bbd166049b0749f1e201f643a8 Mon Sep 17 00:00:00 2001
From: Eduard Keilholz <e.keilholz@4dotnet.nl>
Date: Thu, 22 Aug 2024 11:44:42 +0200
Subject: [PATCH] Fixed date

---
 dotnet-friday/config.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dotnet-friday/config.yaml b/dotnet-friday/config.yaml
index 730ac13..7b23d10 100644
--- a/dotnet-friday/config.yaml
+++ b/dotnet-friday/config.yaml
@@ -137,11 +137,7 @@ params:
     button:
       enable: true
       name: "Register Now"
-<<<<<<< HEAD
       url: "https://www.eventbrite.nl/e/registratie-4dotnet-dotnetfriday-meetup-13-september-2024-998471313577"
-=======
-      url: "https://www.eventbrite.nl/e/registratie-4dotnet-dotnetfriday-meetup-24-mei-2024-871805592997"
->>>>>>> main
       download: true
       newPage: true
     socialLinks: