diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-19 20:10:58 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-19 20:10:58 +0000 |
| commit | 6dc29ca72a890bb16542ff1e795fea5aa642e420 (patch) | |
| tree | 5657d8368172c39dad9354be99b2ee6723b946c5 /doc | |
| parent | ae6655411567dfb620ec64e257be9a294fe9a478 (diff) | |
| download | ikiwiki-6dc29ca72a890bb16542ff1e795fea5aa642e420.tar ikiwiki-6dc29ca72a890bb16542ff1e795fea5aa642e420.tar.gz | |
committing changes for conflict test
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/sandbox.mdwn | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 7a47a34e3..83e9a77fe 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -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]] |