From 4b1a9a1e67133071c9789dd95e08275872e25a8e Mon Sep 17 00:00:00 2001
From: "http://birgitm.myopenid.com/" <http://birgitm.myopenid.com/@web>
Date: Thu, 20 Jun 2013 12:00:28 +0200
Subject:

---
 bibliotek/positiv_dagbog.mdwn | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/bibliotek/positiv_dagbog.mdwn b/bibliotek/positiv_dagbog.mdwn
index c7c3eec8..ea54858d 100644
--- a/bibliotek/positiv_dagbog.mdwn
+++ b/bibliotek/positiv_dagbog.mdwn
@@ -594,8 +594,3 @@ Copyright ©Birgit Månestråle - www.birgitmaanestraale.dk  - 22. + 26. april
 
 
 
-
-<<<<<<< HEAD
-
-=======
->>>>>>> 6e529534846b2593c323eb6b278205d7502c8237
-- 
cgit v1.2.3