non-conficting commit to test merging..

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 99bd5e96488a476baf334ce9cbe6bd4d5b7fe10f..09f353450bf8cd7cfe856fe186791d58e18c061b 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. test 2: testing 1.2.3.4..

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


@@ -32,7 +32,7 @@ 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]]
 * hi mom
 
 [[WikiLink]]