diff options
| author | www-data <www-data@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-19 20:34:10 +0000 |
|---|---|---|
| committer | www-data <www-data@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-19 20:34:10 +0000 |
| commit | 4d50e71d3117b515bf53cc4af8da6dbf75dcaca8 (patch) | |
| tree | 427a0405241ac34a79e54f8e938db6f476f12c92 /doc | |
| parent | 72f0753c30e030aabf64ee597855139105ba5995 (diff) | |
web commit by joey: conflict test
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/sandbox.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 963c810b2..36c755650 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -4,7 +4,7 @@ See [[MarkDown]] for documentation of the markup syntax used on this page. ---- -Here's a paragraph. test 2... +Here's a paragraph. test 2: testing 1.2.3.4.. Here's another one with *emphasised* text. |