diff options
| author | https://www.google.com/accounts/o8/id?id=AItOawkvAQ2pGG272FFZHZbpuyAFEGhj3ph3p9I <paul@web> | 2012-02-29 19:38:29 +0100 |
|---|---|---|
| committer | byvandring.nu website <bynu@mail.bitbase.dk> | 2012-02-29 19:38:29 +0100 |
| commit | dd164ed2e62cb8d38a0ab4f80e756946f8a519d5 (patch) | |
| tree | 67c4ac7662c1c00d9ae2e54d9830b25d06cb75d2 | |
| parent | e0318160b1d2100c46f2944ff1fe5191f1b6a0cd (diff) | |
| -rw-r--r-- | udflugtkbh.mdwn | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/udflugtkbh.mdwn b/udflugtkbh.mdwn index d925bee2..28270ee2 100644 --- a/udflugtkbh.mdwn +++ b/udflugtkbh.mdwn @@ -24,12 +24,11 @@ Byen fortæller med tegn og symboler om de mennesker der engang levede her. På [[Byvandringer|tours]] [[Events og Eventyr|eventyr]] -<<<<<<< HEAD -======= + [[grif.jpg]] [croquet.jpg]] [froerundetaarn.jpg]] [[sunsetdrinks.jpg]] [[skovtur.jpg]] [[kofliser.jpg]] ->>>>>>> 77afcd8d44513e525e1f7a4d30376a23fd6ed00f + |