Merge branch 'main' into 27-09-2024

4DotNet · Aug 22, 2024 · 897a084 · 897a084
2 parents 1819aa6 + d56cbe2
commit 897a084
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/dotnet-friday/config.yaml b/dotnet-friday/config.yaml
@@ -137,7 +137,11 @@ 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: