Rebuild for jessie-backports

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b3eb52f078c8efcc5a3f6a5b488bf8d0d23630d3..d7f866c769ae961ee91a913cb264658580993946 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,6 +1,14 @@
+###Is this a heading? 
+
+Sure it is. 
+

 Nope my friend.
 
 Nope my friend.
 

+<<<<<<< HEAD

 [[test link]]
 [[test link]]

+=======
+[[Test link]]
+>>>>>>> 59f04c5ad3daf0c01e81d28ec1106e23567a1100

 
 [[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]
 
 
 [[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]