web commit by joey: conflict test
parent
6dc29ca72a
commit
6d098608e6
|
@ -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
|
Here's a paragraph. This is a conflict test edit.......
|
||||||
the web.
|
|
||||||
|
|
||||||
Here's another one with *emphasised* text.
|
Here's another one with *emphasised* text.
|
||||||
|
|
||||||
|
@ -34,7 +33,6 @@ Bulleted list
|
||||||
* item
|
* item
|
||||||
* just to try this stuff - looks kool!
|
* just to try this stuff - looks kool!
|
||||||
* test
|
* test
|
||||||
* hi mom!
|
|
||||||
|
|
||||||
[[WikiLink]]
|
[[WikiLink]]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue