summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bibliotek/positiv_dagbog.mdwn5
1 files changed, 0 insertions, 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