----
-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.
* item
* item
* just to try this stuff - looks kool!
-* just another commit (: no preview?
+* test
+* hi mom!
[[WikiLink]]