X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/be60d261e6cbee094e4df74e1bb24c8ad3dc393d..a9664b9df88b738e6551df17d39c96a489f22287:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1c..3ecd58843 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,25 +1,22 @@
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki
+(version [[!version  ]]).
 
-<<<<<<< HEAD
-Test conflict.
-=======
-Testing 123.
->>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
-
-# Header
-
-## Subheader2
+hello world
 
 > This is a blockquote.
 >
 > This is the first level of quoting.
 >
-> > This is nested blockquote.
+> > This is a nested blockquote.
 >
 >> Without a space works too.
 >>> to three levels
 >
 > Back to the first level.
+>
+> added a line in level 1
+> and another
+
 
 Numbered list 
 
@@ -29,6 +26,7 @@ Numbered list
 1. And another..
  1. foo
  2. bar
+ 3. quz
 
 Bulleted list
 
@@ -39,6 +37,9 @@ Bulleted list
   * footballs; runner; unices
   * Cool !
 
+test _this_ out.
+
+`test this code block`
 
 ----
 
@@ -54,7 +55,27 @@ Bulleted list
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
+* <a href="http://kitenet.net/~joey/">Joey's blog</a>
+
+----
+
+# header1
+
+## header2
+
+### header3
+
+#### header4
+
+##### header 5
+
+**bold**
+
+_italic_
+
+test ms
 
+opopopo
 ----
 
 This **SandBox** is also a [[blog]]!