(no commit message)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b8bcc62c403373354d448997593aff44567a1662..4c8621f1cad4ca58cba6de91ce90898478a0fb8b 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -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