diff options
| author | https://www.google.com/accounts/o8/id?id=AItOawk3fIimitIcXPaVA5AHUW67Z9GVc-2wQJU <Michael@web> | 2010-06-27 17:21:45 +0000 |
|---|---|---|
| committer | Joey Hess <joey@finch.kitenet.net> | 2010-06-27 17:21:45 +0000 |
| commit | 72ee9c720f3d99828728202c206c042727eac1b4 (patch) | |
| tree | b6b914b6e84d9ffc44067f38a19a1532177a6cf8 /doc | |
| parent | 52ad4a28769b711a8465283bd1471795e662b0d2 (diff) | |
| download | ikiwiki-72ee9c720f3d99828728202c206c042727eac1b4.tar ikiwiki-72ee9c720f3d99828728202c206c042727eac1b4.tar.gz | |
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/sandbox.mdwn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 8ecaf1cb9..b8bcc62c4 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,5 +1,7 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). +Test conflict. + # Header ## Subheader2 |