From bb216ff0ad183981b5f9be74ccaaf9ef72617922 Mon Sep 17 00:00:00 2001
From: "http://danieroux.com/" <danieroux@web>
Date: Mon, 5 Jul 2010 08:23:20 +0000
Subject: [PATCH]

---
 doc/sandbox.mdwn | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1c..59b1d7fd9 100644
--- 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.
-- 
2.26.2