diff options
| author | Joey Hess <joey@kitenet.net> | 2010-10-23 15:02:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-10-23 15:02:58 -0400 |
| commit | 9aaae1b2ded1cf90c570bfb5f8dc61c29f244d6f (patch) | |
| tree | 781714ccb233cc2d832e681322f92a9cb7502916 /doc/sandbox | |
| parent | 7e8064e9fa8b3f2c3c0bd0aa5458f00552398e06 (diff) | |
| parent | 1c8d7c450b6ec1e6bf9973525bf117035b907e98 (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc/sandbox')
| -rw-r--r-- | doc/sandbox/hey.mdwn | 1 | ||||
| -rw-r--r-- | doc/sandbox/revert_me.mdwn | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/sandbox/hey.mdwn b/doc/sandbox/hey.mdwn new file mode 100644 index 000000000..a955185ef --- /dev/null +++ b/doc/sandbox/hey.mdwn @@ -0,0 +1 @@ +* Hello diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn new file mode 100644 index 000000000..c3212ce71 --- /dev/null +++ b/doc/sandbox/revert_me.mdwn @@ -0,0 +1,5 @@ +this looks good + +alas, + + Error: you are not allowed to change sandbox/revert_me.mdwn |