aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--18/index.html4
1 files changed, 0 insertions, 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>