From 6775a3e394e5050d386536df2b3ae308dfcb9bee Mon Sep 17 00:00:00 2001
From: Guuq <50501321+Guuq@users.noreply.github.com>
Date: Fri, 14 Feb 2020 16:28:34 +0100
Subject: [PATCH] Fixed some pages that were corrupted

---
 feedback/index.html  |  4 ----
 gallery/index.html   | 54 --------------------------------------------
 wireframe/index.html | 23 -------------------
 3 files changed, 81 deletions(-)
diff --git a/feedback/index.html b/feedback/index.html
index a7ad7bb..86d6e61 100644
--- a/feedback/index.html
+++ b/feedback/index.html
@@ -23,11 +23,7 @@
 				<img src="/resources/img/user.png" alt="" class="userImg">
 				<h3>Peer Droog</h3>
 			</div>
-<<<<<<< HEAD
 			<h2 class="userFeedback">"Duidelijke wireframe, de website doet erg goed wat het probeert te bereiken behalve dat er in de gallerij asymmetrie te vinden is en de foto links onderin iets te groot is"</h2>
-=======
-			<h2 class="userFeedback">"duidelijke wireframe, de website doet erg goed wat het probeert te bereiken behalve dat er in de gallerij asymmetrie te vinden is en de foto links onderin iets te groot is"</h2>
->>>>>>> 4025d46f19bf398a874a71b3c44db54cf0560a4a
 		</div><div class="feedback">
 			<div class="user">
 				<img src="/resources/img/user.png" alt="" class="userImg">
diff --git a/gallery/index.html b/gallery/index.html
index d0ddba5..a98a8a9 100644
--- a/gallery/index.html
+++ b/gallery/index.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -50,56 +49,3 @@
 
 </body>
 </html>
-=======
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>Gallerij</title>
-  <link rel="stylesheet" href="/resources/styles/cssall.css">
-  <link rel="stylesheet" href="/resources/styles/navbar.css">
-  <link rel="stylesheet" href="/resources/styles/gallery.css">
-  <script src="https://kit.fontawesome.com/340f4d917c.js" crossorigin="anonymous"></script>
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-</head>
-<body>
-
-  <div id="headsUp">
-    <div class="welcome">
-    <h5>Welkom bij de Gallerij,</h5>
-    <h5>Hier staan alle foto's die op deze website gebruikt zijn.</h5>
-    <h5>Er staan ook foto's tussen die ik nog wil gebruiken.</h5>
-    <h5>Je kan op de foto's klikken om de bron te zien.</h5>
-    </div>
-    <div class="removeOptions">
-    <button class="hideHeadsUp button" onclick="hideHeadsUp()">Begrepen</button>
-    <h5 class="removeHeadsUp" onclick="removeHeadsUp()">Laat mij dit niet meer zien</h5>
-    </div>
-  </div>
-
-<div class="rowImg">
-  <div class="columnImg">
-    <button onclick="window.open('https://www.pexels.com/photo/scenic-view-of-rocky-mountain-during-evening-1624438/', '_self')"><img src="/resources/img/mountain.jpg" alt="img"></button>
-    <button onclick="window.open('https://www.pexels.com/photo/close-up-photography-of-leaves-with-droplets-807598/', '_self')" class="wide"><img src="/resources/img/leaves.jpg" alt="img"></button>
-  </div>
-  <div class="columnImg">
-    <button onclick="window.open('https://www.pexels.com/photo/landscape-photo-of-riverand-pine-trees-2217365/', '_self')"><img src="/resources/img/riverwoods.jpg" alt="img"></button>
-    <button onclick="window.open('https://www.pexels.com/photo/asphalt-dark-dawn-endless-531321/', '_self')" class="wide"><img src="/resources/img/roadwoods.jpg" alt="img"></button>
-  </div>
-  <div class="columnImg">
-    <button onclick="window.open('https://www.pexels.com/photo/concrete-road-between-trees-1563356/', '_self')" class="wide"><img src="/resources/img/roadwoodsred.jpg" alt="img"></button>
-    <button onclick="window.open('https://www.pexels.com/photo/silhouette-of-trees-during-sunset-1723637/', '_self')"><img src="/resources/img/sunset.jpg" alt="img"></button>
-  </div>
-</div>
-
-<script src="/resources/json/navbar.json.js"></script>
-<script src="/resources/scripts/insertNavbar.js"></script>
-<script src="/resources/scripts/javall.js"></script>
-<script src="/resources/scripts/gallery.js"></script>
-
-</body>
-</html>
->>>>>>> 4025d46f19bf398a874a71b3c44db54cf0560a4a
diff --git a/wireframe/index.html b/wireframe/index.html
index a3a00ec..e8e6588 100644
--- a/wireframe/index.html
+++ b/wireframe/index.html
@@ -1,26 +1,4 @@
-<<<<<<< HEAD
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>Wireframe</title>
-  <link rel="stylesheet" href="/resources/styles/cssall.css">
-  <link rel="stylesheet" href="/resources/styles/navbar.css">
-  <script src="https://kit.fontawesome.com/340f4d917c.js" crossorigin="anonymous"></script>
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-</head>
-<body style="padding-top:55px;">
-  <img src="/resources/img/wireframe.png" alt="wireframe">
 
-  <script src="/resources/json/navbar.json.js"></script>
-  <script src="/resources/scripts/insertNavbar.js"></script>
-  <script src="/resources/scripts/javall.js"></script>
-</body>
-</html>
-=======
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -42,4 +20,3 @@
   <script src="/resources/scripts/javall.js"></script>
 </body>
 </html>
->>>>>>> 4025d46f19bf398a874a71b3c44db54cf0560a4a
