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