Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
d/ikiwiki.doc-base: register the documentation with doc-base
[git.ikiwiki.info.git]
/
doc
/
sandbox.mdwn
diff --git
a/doc/sandbox.mdwn
b/doc/sandbox.mdwn
index 038412d14b09156f2cee05e93ce4b3600587c3ad..0872462f60f9ab979d1ad12dca9dac2097a1b6a5 100644
(file)
--- a/
doc/sandbox.mdwn
+++ b/
doc/sandbox.mdwn
@@
-1,3
+1,7
@@
+###Is this a heading?
+
+Sure it is.
+
Nope my friend.
<<<<<<< HEAD
Nope my friend.
<<<<<<< HEAD
@@
-209,3
+213,7
@@
Räksmörgås.
Testing. Test. 試験として書き込みします。
Καλημέρα!
Testing. Test. 試験として書き込みします。
Καλημέρα!
+
+test
+
+I must **emphasise** this.