From: https://www.google.com/accounts/o8/id?id=AItOawk3fIimitIcXPaVA5AHUW67Z9GVc-2wQJU <Michael@web>
Date: Sun, 27 Jun 2010 17:22:41 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 3.20100704~24^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e68a48b63a532369d97709dd189d233c5fd0298;p=ikiwiki.git

---

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