(no commit message)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1cad4ca58cba6de91ce90898478a0fb8b..59b1d7fd965a4809b1cc2f0eb7c19b4b4e01d250 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,15 +1,5 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-<<<<<<< HEAD
-Test conflict.
-=======
-Testing 123.
->>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
-
-# Header
-
-## Subheader2
-
 > This is a blockquote.
 >
 > This is the first level of quoting.