From: https://www.google.com/accounts/o8/id?id=AItOawk8xAM2eNwroSSl-Pb9eqkb9apWStenU2U <Leha@web>
Date: Mon, 20 Feb 2012 11:24:39 +0000 (-0400)
Subject: (no commit message)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0726ac642068429d86f548c66904f087f7b2ffa6;p=ikiwiki.git

---

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.