web commit by http://willthompson.co.uk/

[ikiwiki.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index af357f4dce35684ce92b83575ca704016901fd21..b7c9fc1851b700d4261bd1246d668f0a54d0d3fd 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -61,6 +61,7 @@ Bulleted list
   * two
      * three
        * four
+        * five
 
 ----
 
@@ -109,5 +110,4 @@ Test.. I was looking for a wiki supporting OpenID~
 ----
 me too...
 
-
-This is a test for conflict2
\ No newline at end of file
+[[if test="sandbox/C++" then="[[sandbox/C++]]" else="sad face!"]]
\ No newline at end of file