From 73a7bd2f689bb259ceb427375a7196ddcb3f48da Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 18 Jan 2009 00:45:46 +0100 Subject: [PATCH] fix previous buggy merge --- IkiWiki/Plugin/skeleton.pm.example | 4 +--- 1 file changed, 1 insertion(+), 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 ($$$) {