Merge branch 'master' into debian-jessie-backports

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index fbaf7f9f382e9d0fe51db0009a9e17895c81e5f1..e3b8412dfde15a142260040890e0854800e79713 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,15 @@
+###Is this a heading? 
+
+Sure it is. 
+
 Nope my friend.
 
+<<<<<<< HEAD
+[[test link]]
+=======
+[[Test link]]
+>>>>>>> 59f04c5ad3daf0c01e81d28ec1106e23567a1100
+
 [[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]
 
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki
@@ -203,3 +213,5 @@ Räksmörgås.
 Testing. Test. 試験として書き込みします。
 
 Καλημέρα!
+
+test