aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhttps://www.google.com/accounts/o8/id?id=AItOawk8xAM2eNwroSSl-Pb9eqkb9apWStenU2U <Leha@web>2012-02-20 07:24:39 -0400
committeradmin <admin@branchable.com>2012-02-20 07:24:39 -0400
commit0726ac642068429d86f548c66904f087f7b2ffa6 (patch)
treee2209831e7a2d10e9f91f2fbf5efec4d7dafdad6
parent950a45ec7709203716db3df0dea29fb0f236b773 (diff)
downloadikiwiki-0726ac642068429d86f548c66904f087f7b2ffa6.tar
ikiwiki-0726ac642068429d86f548c66904f087f7b2ffa6.tar.gz
-rw-r--r--doc/sandbox.mdwn1
1 files changed, 1 insertions, 0 deletions
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.