po: s/utf-8/UTF-8, to solve part of the double commit bug.

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8aedcbb9e6beafb9dfff37d14161acb47e34fbb9..4c8621f1cad4ca58cba6de91ce90898478a0fb8b 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,9 +1,14 @@
 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
 
 
 # Header
 

-## Subheader
+## Subheader2

 
 > This is a blockquote.
 >
 
 > This is a blockquote.
 >


@@ -31,7 +36,9 @@ Bulleted list
 * *item*
 * item
 * one
 * *item*
 * item
 * one

-  * two
+  * footballs; runner; unices
+  * Cool !
+

 
 ----
 
 
 ----
 


@@ -48,13 +55,7 @@ Bulleted list
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 

------
-
-[[!progress percent=27]]
-
-[[!progress percent=78]]
-
------
+----

 
 This **SandBox** is also a [[blog]]!
 
 
 This **SandBox** is also a [[blog]]!