projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 52ad4a2)
(no commit message)
authorhttps://www.google.com/accounts/o8/id?id=AItOawk3fIimitIcXPaVA5AHUW67Z9GVc-2wQJU <Michael@web>
Sun, 27 Jun 2010 17:21:45 +0000 (17:21 +0000)
committerJoey Hess <joey@finch.kitenet.net>
Sun, 27 Jun 2010 17:21:45 +0000 (17:21 +0000)
doc/sandbox.mdwn patch | blob | history

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8ecaf1cb9d4347fa717174197cf83c9cdcb68942..b8bcc62c403373354d448997593aff44567a1662 100644 (file)
--- 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
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.