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 b3eb52f078c8efcc5a3f6a5b488bf8d0d23630d3..038412d14b09156f2cee05e93ce4b3600587c3ad 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,6 +1,10 @@
 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"]]