Update README.md

l3montree-dev · Jan 3, 2025 · 0db9aed · 0db9aed
1 parent 19e00b6
commit 0db9aed
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -32,11 +32,3 @@ Website: https://open-source-bonn.de
 Register on our website.
 
 Join our [Discord community](https://discord.gg/BCBjCvgk) for updates and networking.
-
----
-<<<<<<< HEAD
-
-Let’s hack for a safer digital world!
-# eu-open-source-week-offside-event-bonn-website
-=======
->>>>>>> c06154b495122c72a822cdaf2dce1bb6217262bd