web commit by joey: conflict test

[ikiwiki.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 42f8f3773145e082c724d51f05909c503df6e31e..cc37a9978e18cd0e4e1029523a003486a00ddf2c 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,7 +4,7 @@ See [[MarkDown]] for documentation of the markup syntax used on this page.
 
 ----
 
-Here's a paragraph.
+Here's a paragraph. This is a conflict test edit.......
 
 Here's another one with *emphasised* text.
 
@@ -32,7 +32,7 @@ Bulleted list
 * item
 * item
 * just to try this stuff - looks kool!
-* just another commit (: no preview?
+* test
 
 [[WikiLink]]