From e66d9028feb5245aeff463a1c9f3fb2060d224dd Mon Sep 17 00:00:00 2001
From: Noah Loomans <noahloomans@gmail.com>
Date: Sat, 19 May 2018 13:15:01 +0200
Subject: Actually fix merge conflict...

---
 18/index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/18/index.html b/18/index.html
index 015a546..41d3e43 100644
--- a/18/index.html
+++ b/18/index.html
@@ -51,11 +51,7 @@
             <p>Neem dus je OV mee, <b>ook als je direct naar de escape room gaat!</b></p>
             <p>
                 <b>Locatie escape room: </b>
-<<<<<<< HEAD
                 <i>Laurierstraat 88</i>
-=======
-                <i>[REDACTED]</i>
->>>>>>> a727742e57ab370d4fdf46d67b512b0755e51a92
                 <br>
                 <b>Locatie: </b>
                 <i>[REDACTED]</i>
-- 
cgit v1.1