X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=doc%2Fsandbox.mdwn;h=137075ee7585b1f20c5accba61ab13270aff7ee0;hp=4c8621f1cad4ca58cba6de91ce90898478a0fb8b;hb=e5c4b811369f271dc313741538adfe7cbf745be6;hpb=6e68a48b63a532369d97709dd189d233c5fd0298

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1c..137075ee7 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,20 +1,10 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-<<<<<<< HEAD
-Test conflict.
-=======
-Testing 123.
->>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
-
-# Header
-
-## Subheader2
-
 > 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
@@ -25,10 +15,12 @@ Numbered list
 
 1. First item.
  1. Sub item.
+ 2. bar
 1. Another.
 1. And another..
  1. foo
  2. bar
+ 3. quz
 
 Bulleted list
 
@@ -54,7 +46,10 @@ Bulleted list
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
+* <test.html>
 
+<google.de>
+<http://www.perl.it>
 ----
 
 This **SandBox** is also a [[blog]]!