X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/950a45ec7709203716db3df0dea29fb0f236b773..498883cc1e82dcdbeb02f6f2776461668c312957:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 6d589e33b..47785d0bf 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,6 +1,7 @@
 # Sandbox
 
 [[!pagestats  pages="/tags/*"]]
+<<<<<<< HEAD
 ttt
 [[!sidebar  content="dfdsfsf""
 This is my custom sidebar for this page.