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

web commit by joey: conflict test

master
www-data 2006-03-19 20:12:15 +00:00
parent 6dc29ca72a
commit 6d098608e6
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/sandbox.mdwn
View File

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