projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
web commit by http://nicholas.allen.myopenid.com/
[ikiwiki.git]
/
doc
/
sandbox.mdwn
diff --git
a/doc/sandbox.mdwn
b/doc/sandbox.mdwn
index dee1b054eecfc546d662020f76183e3818e571cb..af357f4dce35684ce92b83575ca704016901fd21 100644
(file)
--- a/
doc/sandbox.mdwn
+++ b/
doc/sandbox.mdwn
@@
-108,3
+108,6
@@
Test.. I was looking for a wiki supporting OpenID~
----
me too...
+
+
+This is a test for conflict2
\ No newline at end of file