From 7cf450bd6c5a71aa4a487f8e291bc5102d1d8711 Mon Sep 17 00:00:00 2001
From: Delia Mennitti <mennittid@gmail.com>
Date: Fri, 1 Dec 2023 15:55:44 +0100
Subject: [PATCH] rebased

---
 src/config/_default/config.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/config/_default/config.yml b/src/config/_default/config.yml
index f7fd6393..bfddfc86 100644
--- a/src/config/_default/config.yml
+++ b/src/config/_default/config.yml
@@ -163,15 +163,7 @@ menu:
     # --- Web Components ---
     - identifier: web-components
       name: Web Components
-<<<<<<< HEAD
-<<<<<<< HEAD
       URL: "/web-components"
-=======
-      URL: "/webcomponents"
->>>>>>> c068c09 (added webcomp and removed old files)
-=======
-      URL: "/web-components"
->>>>>>> 918f9fa (fix link to /web-components)
       weight: 4
 
     # --- Quickstart ---