fix previous buggy merge

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index 30c8dbd5c82d06dde62bc7a219fbcbf77bd64177..7506816f19481afd9812cdde1acd9d81e64f19a2 100644 (file)
--- 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 ($$$) {