diff options
| author | intrigeri <intrigeri@boum.org> | 2010-06-29 15:53:51 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-06-29 15:53:51 +0200 |
| commit | 1786b106a9c7f448136ff47d9b6dd26d48a5dd2e (patch) | |
| tree | edfeed77be4a56ed06095bd67eb7cbc05a1a1eca /doc/sandbox.mdwn | |
| parent | b225fdc44d4b3d2853db622d59aed7b59788aeec (diff) | |
| parent | be60d261e6cbee094e4df74e1bb24c8ad3dc393d (diff) | |
Merge remote branch 'upstream/master' into prv/po
Conflicts:
doc/plugins/po.mdwn
Diffstat (limited to 'doc/sandbox.mdwn')
| -rw-r--r-- | doc/sandbox.mdwn | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 8ecaf1cb9..4c8621f1c 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,5 +1,11 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). +<<<<<<< HEAD +Test conflict. +======= +Testing 123. +>>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718 + # Header ## Subheader2 |