summaryrefslogtreecommitdiff
path: root/index.mdwn
diff options
context:
space:
mode:
authorBlanksøgård <web-bsg@coreander.jones.dk>2007-10-29 10:12:13 +0100
committerBlanksøgård <web-bsg@coreander.jones.dk>2007-10-29 10:12:13 +0100
commit3c9a8b7a3c9546d63e363f8c274ce0950ee5b390 (patch)
tree354435a1c0063dfd9f1ae536933e706b92e2ce7d /index.mdwn
parent417eb303c078979f507d229d592096c114967fcb (diff)
web commit by soren: Om Henrik
Diffstat (limited to 'index.mdwn')
-rw-r--r--index.mdwn5
1 files changed, 5 insertions, 0 deletions
diff --git a/index.mdwn b/index.mdwn
index 7687937..58ee745 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -4,6 +4,11 @@ Her er nogle sider at begynde med:
* [[Årets_gang|cyklus]]
* [[Produkter]]
* [[Manden]]
+* [[Year]]
+<<<<<<< HEAD:index.mdwn
+=======
+* [[Året]]
+>>>>>>> 7d7c75a3ebdad2fa84d6fe37d3d376616fd40646:index.mdwn
Opret flere sider ved at redigere denne side og nævn den nye side i dobbelte lodrette klammer.