From e0318160b1d2100c46f2944ff1fe5191f1b6a0cd Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawkvAQ2pGG272FFZHZbpuyAFEGhj3ph3p9I"
 <paul@web>
Date: Wed, 29 Feb 2012 19:37:55 +0100
Subject:

---
 udflugtkbh.mdwn | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'udflugtkbh.mdwn')

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
-- 
cgit v1.2.3