urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

committing changes for conflict test

master
joey 2006-03-19 20:10:58 +00:00
parent ae66554115
commit 6dc29ca72a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/sandbox.mdwn
View File

@ -4,7 +4,8 @@ See [[MarkDown]] for documentation of the markup syntax used on this page.
----
Here's a paragraph.
Here's a paragraph. This is a confict test; I'm also editing this line on
the web.
Here's another one with *emphasised* text.
@ -33,6 +34,7 @@ Bulleted list
* item
* just to try this stuff - looks kool!
* test
* hi mom!
[[WikiLink]]