first cut at svn merge and conflict

[git.ikiwiki.info.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 42f8f3773145e082c724d51f05909c503df6e31e..7a47a34e30635814ff639577b633a998d1339285 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -32,7 +32,7 @@ Bulleted list
 * item
 * item
 * just to try this stuff - looks kool!
-* just another commit (: no preview?
+* test
 
 [[WikiLink]]