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

---

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8ecaf1cb9..b8bcc62c4 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,7 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
+Test conflict.
+
 # Header
 
 ## Subheader2