From c29469d5afc058e7c253d869d51ecf8efead7381 Mon Sep 17 00:00:00 2001
From: annasandri <annasandri@xpub.nl>
Date: Wed, 20 May 2020 20:30:26 +0200
Subject: [PATCH] Update 'index.html'

---
 index.html | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/index.html b/index.html
index 85e7b66..62bd3da 100644
--- a/index.html
+++ b/index.html
@@ -191,30 +191,6 @@
 			</a>
 		</div>
 
-
-<<<<<<< HEAD
-                	<p>Avital Barkai, Damlanur Bilgin, Sandra Golubjevaite, Tisa Neža Herlec, Mark van den Heuvel, Max Lehmann, Mika Motskobili, Clara Noseda, Anna Sandri, and Ioana Tomici</p>
-                </div>
-			</a>
-		</div>
-		<div id="special-issue-11" class="issue future">
-			<a href="11/index.html">
-				<div class="issue-nr">Special<br> Issue 11</div>
-				<div class="issue-date"></div>
-				<div class="issue-img"><img src="img/unknown.svg"></div>
-				<div class="issue-title"></div>
-			</a>
-		</div>
-		<div id="special-issue-12" class="issue future">
-			<a href="12/index.html">
-				<div class="issue-nr">Special<br> Issue 12</div>
-				<div class="issue-date"></div>
-				<div class="issue-img"><img src="img/special-issue-12.png"></div>
-				<div class="issue-title"></div>
-			</a>
-		</div>
-=======
->>>>>>> 414f118988fb023c2b482172f57eafde3a71e50f
 	</section>
 </body>
 </html>