committing changes for conflict test

[git.ikiwiki.info.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 42f8f3773145e082c724d51f05909c503df6e31e..83e9a77fe5bb592ebd0cd478d914d4a5c266290a 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,7 +4,8 @@ See [[MarkDown]] for documentation of the markup syntax used on this page.
 
 ----
 
 
 ----
 

-Here's a paragraph.
+Here's a paragraph. This is a confict test; I'm also editing this line on
+the web.

 
 Here's another one with *emphasised* text.
 
 
 Here's another one with *emphasised* text.
 


@@ -32,7 +33,8 @@ Bulleted list
 * item
 * item
 * just to try this stuff - looks kool!
 * item
 * item
 * just to try this stuff - looks kool!

-* just another commit (: no preview?
+* test
+* hi mom!

 
 [[WikiLink]]
 
 
 [[WikiLink]]