diff options
| author | intrigeri <intrigeri@boum.org> | 2009-01-18 00:45:46 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-01-18 00:45:46 +0100 |
| commit | 73a7bd2f689bb259ceb427375a7196ddcb3f48da (patch) | |
| tree | c7ef0a83e342c0f2f9c95e88d33c09195e34d414 /IkiWiki/Plugin/skeleton.pm.example | |
| parent | e9e75f5f29d78b0631f98d9b0fa93184fcb181fe (diff) | |
fix previous buggy merge
Diffstat (limited to 'IkiWiki/Plugin/skeleton.pm.example')
| -rw-r--r-- | IkiWiki/Plugin/skeleton.pm.example | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example index 30c8dbd5c..7506816f1 100644 --- a/IkiWiki/Plugin/skeleton.pm.example +++ b/IkiWiki/Plugin/skeleton.pm.example @@ -182,7 +182,6 @@ sub canedit ($$$) { debug("skeleton plugin running in canedit"); } -<<<<<<< HEAD:IkiWiki/Plugin/skeleton.pm.example sub cansave ($$$$) { my $page=shift; my $content=shift; @@ -206,12 +205,11 @@ sub canrename ($$$) { my $session=shift; debug("skeleton plugin running in canrename"); -======= + sub checkcontent (@) { my %params=@_; debug("skeleton plugin running in checkcontent"); ->>>>>>> upstream/master:IkiWiki/Plugin/skeleton.pm.example } sub editcontent ($$$) { |