remove useless uses of scalar

[git.ikiwiki.info.git] / IkiWiki / Plugin / skeleton.pm.example

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index 30c8dbd5c82d06dde62bc7a219fbcbf77bd64177..59503a462ef81c64399e4cd4bda658543994388d 100644 (file)
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -30,7 +30,6 @@ sub import {
        hook(type => "auth", id => "skeleton", call => \&auth);
        hook(type => "sessioncgi", id => "skeleton", call => \&sessioncgi);
        hook(type => "canedit", id => "skeleton", call => \&canedit);
        hook(type => "auth", id => "skeleton", call => \&auth);
        hook(type => "sessioncgi", id => "skeleton", call => \&sessioncgi);
        hook(type => "canedit", id => "skeleton", call => \&canedit);

-       hook(type => "cansave", id => "skeleton", call => \&cansave);

        hook(type => "checkcontent", id => "skeleton", call => \&checkcontent);
        hook(type => "editcontent", id => "skeleton", call => \&editcontent);
        hook(type => "formbuilder_setup", id => "skeleton", call => \&formbuilder_setup);
        hook(type => "checkcontent", id => "skeleton", call => \&checkcontent);
        hook(type => "editcontent", id => "skeleton", call => \&editcontent);
        hook(type => "formbuilder_setup", id => "skeleton", call => \&formbuilder_setup);


@@ -182,16 +181,6 @@ sub canedit ($$$) {
        debug("skeleton plugin running in canedit");
 }
 
        debug("skeleton plugin running in canedit");
 }
 

-<<<<<<< HEAD:IkiWiki/Plugin/skeleton.pm.example
-sub cansave ($$$$) {
-       my $page=shift;
-       my $content=shift;
-       my $cgi=shift;
-       my $session=shift;
-
-       debug("skeleton plugin running in cansave");
-}
-

 sub canremove ($$$) {
        my $page=shift;
        my $cgi=shift;
 sub canremove ($$$) {
        my $page=shift;
        my $cgi=shift;


@@ -206,12 +195,11 @@ sub canrename ($$$) {
        my $session=shift;
 
        debug("skeleton plugin running in canrename");
        my $session=shift;
 
        debug("skeleton plugin running in canrename");

-=======
+

 sub checkcontent (@) {
        my %params=@_;
 
        debug("skeleton plugin running in checkcontent");
 sub checkcontent (@) {
        my %params=@_;
 
        debug("skeleton plugin running in checkcontent");

->>>>>>> upstream/master:IkiWiki/Plugin/skeleton.pm.example

 }
 
 sub editcontent ($$$) {
 }
 
 sub editcontent ($$$) {