]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
(no commit message)
authorhttps://www.google.com/accounts/o8/id?id=AItOawk3fIimitIcXPaVA5AHUW67Z9GVc-2wQJU <Michael@web>
Sun, 27 Jun 2010 17:22:41 +0000 (17:22 +0000)
committerJoey Hess <joey@finch.kitenet.net>
Sun, 27 Jun 2010 17:22:41 +0000 (17:22 +0000)
doc/sandbox.mdwn

index b8bcc62c403373354d448997593aff44567a1662..4c8621f1cad4ca58cba6de91ce90898478a0fb8b 100644 (file)
@@ -1,6 +1,10 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
+<<<<<<< HEAD
 Test conflict.
+=======
+Testing 123.
+>>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
 
 # Header