adsf

Team5045 · Jan 10, 2024 · 4a82b1b · 4a82b1b
2 parents 949da57 + 2a9703a
commit 4a82b1b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/public/assets/config-hello.json b/public/assets/config-hello.json
@@ -1,6 +1,11 @@
 {
+<<<<<<< HEAD
   "heading": "bobot - 2024",
   "logo": "firebot.png",
+=======
+  "heading": "Crescendo - 2024",
+  "logo": "logo.png",
+>>>>>>> refs/remotes/origin/main
   "pages": [
     {
       "name": "Setup",