projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6b6fd77)
non-conficting commit to test merging..
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sun, 19 Mar 2006 20:35:59 +0000 (20:35 +0000)
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sun, 19 Mar 2006 20:35:59 +0000 (20:35 +0000)
doc/sandbox.mdwn patch | blob | history

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 36c755650f26d79a8a97e2fe02bbe38447dbfa1b..09f353450bf8cd7cfe856fe186791d58e18c061b 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -33,6 +33,7 @@ Bulleted list
 * item
 * just to try this stuff - looks kool!
 * test
+* hi mom
 
 [[WikiLink]]
 
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.