projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 950a45e)
(no commit message)
authorhttps://www.google.com/accounts/o8/id?id=AItOawk8xAM2eNwroSSl-Pb9eqkb9apWStenU2U <Leha@web>
Mon, 20 Feb 2012 11:24:39 +0000 (07:24 -0400)
committeradmin <admin@branchable.com>
Mon, 20 Feb 2012 11:24:39 +0000 (07:24 -0400)
doc/sandbox.mdwn patch | blob | history

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.
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.