Fixed date

4DotNet · Aug 22, 2024 · 0d05e25 · 0d05e25
1 parent 897a084
commit 0d05e25
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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: