From 937ffac8067fcabf88999dbbf3ad62a947e26eff Mon Sep 17 00:00:00 2001
From: Niels Yannick Tietze <3020513@stud.hs-mannheim.de>
Date: Mon, 28 Sep 2026 19:24:40 +0200
Subject: [PATCH] Update 5

---
 index.html | 5 -----
 1 file changed, 5 deletions(-)
diff --git a/index.html b/index.html
index abb397e..ef2e8d7 100644
--- a/index.html
+++ b/index.html
@@ -1,14 +1,9 @@
 <!doctype html>
 <html lang="de">
     <head>
-<<<<<<< HEAD
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-=======
         <meta charset="UTF-8" />
         <link rel="stylesheet" href="/src/styles/navigation.css" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
->>>>>>> 4cae17a55d3ddede04a97b1995bf5c1c8fa693a1
         <meta
             name="description"
             content="Ernährungsberatung bei Tri-hub: Essen, Trinken und Energiemanagement für deinen Triathlon ab 50."
