(no commit message)

[ikiwiki.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 6d589e33bf01b8749daee9a7b7787a3caa340f0a..47785d0bf710cadfeaf69520f43c319626e37017 100644 (file)
--- 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.