From 239204677c494604d2bbc11c51854c7c03745f05 Mon Sep 17 00:00:00 2001
From: JoulianALS <joulianalsuliman@gmail.com>
Date: Wed, 17 Apr 2024 09:56:58 +0200
Subject: [PATCH] Fertiger Commit/Merge

---
 index.html | 55 ++++--------------------------------------------------
 1 file changed, 4 insertions(+), 51 deletions(-)
diff --git a/index.html b/index.html
index 1fa3942..8b99f38 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
-<<<<<<< HEAD
+<html lang="de">
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -10,8 +9,7 @@
         <title>ZooWebsite</title>
     </head>
     <body>
-        <!-- Navbar -->
-                   
+        <!-- Navbar -->    
         <nav class="navbar sticky-top navbar-expand-lg bg-body-tertiary bg-dark border-bottom border-body" data-bs-theme="dark">
             <div class="container-fluid">
                 <a class="navbar-brand" href="#"><img src="Src/zoowebseite-high-resolution-logo-transparent.png" alt="Logo" width="120" height="120" class="d-inline-block align-text"></a>
@@ -27,32 +25,9 @@
                 </div>
             </div>
         </nav>
-=======
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="stylesheet" href="Styles/style.css">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/swiper@11/swiper-bundle.min.css"/>
-    <title>ZooWebsite</title>
-</head>
-<body>
-    <!-- Navbar -->
-    <nav>
-        <a><img>logo</a>
-        <ul>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-        </ul>
-    </nav>
->>>>>>> b6709c537aad53c77ce742111eb198c5148556eb
 
         <!-- Über Uns Section -->
-        <section>
-            <section class="container" id="ueberUns">
+        <section class="container" id="ueberUns">
         <div class="row">
             <div class="col-md-6">
                 <!-- Gallery -->
@@ -68,10 +43,8 @@
                     <div class="swiper-pagination"></div>
                 </div>
             </div>
-<<<<<<< HEAD
         </nav>
         </section>
-=======
             <!-- Text content -->
             <div class="col-md-6">
                 <h2>Text on the Right</h2>
@@ -80,13 +53,6 @@
         </div>
     </section>
 
-    <!-- Öffnungszeiten Section -->
-    <section>
-        <h1>Öffnungszeiten</h1>
-        <p>Öffnungszeiten</p>
-    </section>
->>>>>>> b6709c537aad53c77ce742111eb198c5148556eb
-
         <!-- Öffnungszeiten Section -->
         <section class="container d-flex" id="openingHours">
             <div class="row justify-content-center align-self-center">
@@ -123,7 +89,6 @@
             <p>Patenshop</p>
         </section>
 
-<<<<<<< HEAD
         <!-- Footer -->
         <footer class="container-fluid d-flex bg-dark">
             <img src="Src/zoowebseite-high-resolution-logo-transparent.png" height="200" class="align-self-center">
@@ -135,18 +100,6 @@
                 <li></li>
             </div>
         </footer>
-=======
-    <!-- Footer -->
-    <footer>
-        <ul>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-        </ul>
-    </footer>
->>>>>>> b6709c537aad53c77ce742111eb198c5148556eb
 
         <!-- JavaScript -->
         <script src="https://cdn.jsdelivr.net/npm/swiper@11/swiper-bundle.min.js"></script>
@@ -154,4 +107,4 @@
         <script src="Javascript/app.js"></script>
 
     </body>
-</html>
\ No newline at end of file
+</html>
