diff --git a/Exercise 1/home.html b/Exercise 1/home.html
index d4ef7c8a1009bd0c7708b3c2ccfc2876eb9e3b0b..04630878905a44b0a654c0a6d026b5428ef851d0 100644
--- a/Exercise 1/home.html
+++ b/Exercise 1/home.html
@@ -1,22 +1,3 @@
-<<<<<<< HEAD:Exercise 1/home.html
-<!doctype html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <title>Home page</title>
- <link rel="stylesheet" href="style.css">
- <script src="script.js"></script>
-
-</head>
-<body>
-
-<div id="home-div">
- <img src="images/image5-small.jpg">
-</div>
-
-</body>
-=======
<!doctype html>
<html lang="en">
<head>
@@ -30,9 +11,8 @@
<body>
<div id="home-div">
- <img src="image5-small.jpg">
+ <img src="images/image5-small.jpg">
</div>
</body>
->>>>>>> cc2dd46e0fff5b3555924b908ffd108deabb1e1a:Exercise 1+2/home.html
</html>
\ No newline at end of file
diff --git a/Exercise 1/slideshow.html b/Exercise 1/slideshow.html
index a5860faf0ee2b7a129e01f3326a9d3dffb2ed020..2ac5937e32cd2fa0218a9abbe92be317c0f3f55f 100644
--- a/Exercise 1/slideshow.html
+++ b/Exercise 1/slideshow.html
@@ -1,61 +1,3 @@
-<<<<<<< HEAD:Exercise 1/slideshow.html
-<!doctype html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <title>Slideshow page</title>
- <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
- <link rel="stylesheet" href="desoslide-2.2.0\doc\assets\css\vendor\animate\animate.min.css">
- <link href="desoslide-2.2.0\dist\css\jquery.desoslide.css" rel="stylesheet">
- <link href="desoslide-2.2.0\dist\css\jquery.desoslide.min.css" rel="stylesheet">
- <link rel="stylesheet" href="style.css">
-
- <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
- <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
- <script src="desoslide-2.2.0\src\js\jquery.desoslide.js"></script>
- <script src="desoslide-2.2.0\dist\js\jquery.desoslide.min.js"></script>
- <script src="script.js"></script>
-
-
-</head>
-<body>
- <div id="slideshow-wrapper">
- <div id="thumbs-div">
- <ul id="slideshow_thumbs" class="desoslide-thumbs-horizontal list-inline text-center">
- <li>
- <a href="images/image1.jpg">
- <img src="images/image1-small.jpg"
- alt="Cat"
- data-desoslide-caption-title="A cat">
- </a>
- </li>
- <li>
- <a href="images/image2.jpg">
- <img src="images/image2-small.jpg" alt="Image"
- data-desoslide-caption-title="Another cat">
- </a>
- </li>
- <li>
- <a href="images/image3.jpg">
- <img src="images/image3-small.jpg" alt="Image"
- data-desoslide-caption-title="More cat">
- </a>
- </li>
-
- </ul>
- </div>
- <div id="slideshow-div">
- <ul id="slideshow"></ul>
- </div>
-
-
-
-
-</div>
-
-</body>
-=======
<!doctype html>
<html lang="en">
<head>
@@ -63,15 +5,15 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Slideshow page</title>
<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
- <link rel="stylesheet" href="\Exercise 1\desoslide-2.2.0\doc\assets\css\vendor\animate\animate.min.css">
- <link href="\Exercise 1\desoslide-2.2.0\dist\css\jquery.desoslide.css" rel="stylesheet">
- <link href="\Exercise 1\desoslide-2.2.0\dist\css\jquery.desoslide.min.css" rel="stylesheet">
+ <link rel="stylesheet" href="desoslide-2.2.0\doc\assets\css\vendor\animate\animate.min.css">
+ <link href="desoslide-2.2.0\dist\css\jquery.desoslide.css" rel="stylesheet">
+ <link href="desoslide-2.2.0\dist\css\jquery.desoslide.min.css" rel="stylesheet">
<link rel="stylesheet" href="style.css">
<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
- <script src="\Exercise 1\desoslide-2.2.0\src\js\jquery.desoslide.js"></script>
- <script src="\Exercise 1\desoslide-2.2.0\dist\js\jquery.desoslide.min.js"></script>
+ <script src="desoslide-2.2.0\src\js\jquery.desoslide.js"></script>
+ <script src="desoslide-2.2.0\dist\js\jquery.desoslide.min.js"></script>
<script src="script.js"></script>
@@ -81,21 +23,21 @@
<div id="thumbs-div">
<ul id="slideshow_thumbs" class="desoslide-thumbs-horizontal list-inline text-center">
<li>
- <a href="\Exercise 1\images\image1.jpg">
- <img src="\Exercise 1\images\image1-small.jpg"
+ <a href="images/image1.jpg">
+ <img src="images/image1-small.jpg"
alt="Cat"
data-desoslide-caption-title="A cat">
</a>
</li>
<li>
- <a href="\Exercise 1\images\image2.jpg">
- <img src="\Exercise 1\images\image2-small.jpg" alt="Image"
+ <a href="images/image2.jpg">
+ <img src="images/image2-small.jpg" alt="Image"
data-desoslide-caption-title="Another cat">
</a>
</li>
<li>
- <a href="\Exercise 1\images\image3.jpg">
- <img src="\Exercise 1\images\image3-small.jpg" alt="Image"
+ <a href="images/image3.jpg">
+ <img src="images/image3-small.jpg" alt="Image"
data-desoslide-caption-title="More cat">
</a>
</li>
@@ -112,5 +54,4 @@
</div>
</body>
->>>>>>> cc2dd46e0fff5b3555924b908ffd108deabb1e1a:Exercise 1+2/slideshow.html
</html>
\ No newline at end of file