diff options
| author | www-data <www-data@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-19 20:17:20 +0000 |
|---|---|---|
| committer | www-data <www-data@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-19 20:17:20 +0000 |
| commit | 72f0753c30e030aabf64ee597855139105ba5995 (patch) | |
| tree | b2a95992ca3c598b34f05373119f48978f5c36d7 | |
| parent | 6d098608e661aca27ca76f29e4c0ab065d808609 (diff) | |
web commit by joey: conflict test
| -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 cc37a9978..963c810b2 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. This is a conflict test edit....... +Here's a paragraph. test 2... Here's another one with *emphasised* text. |