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