diff options
| author | Noah Loomans <noahloomans@gmail.com> | 2018-05-19 13:15:01 +0200 |
|---|---|---|
| committer | Noah Loomans <noahloomans@gmail.com> | 2018-05-19 13:15:01 +0200 |
| commit | e66d9028feb5245aeff463a1c9f3fb2060d224dd (patch) | |
| tree | ea1dac1479b6743999a538936825105099f5c98c /18 | |
| parent | d2e54a7b8e6bd725587409df138111bab0c103e4 (diff) | |
Actually fix merge conflict...
Diffstat (limited to '18')
| -rw-r--r-- | 18/index.html | 4 |
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> |