X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/40de619d4968ecd7dc0086ca5118746bc3db3860..832d4d31d177d5d5f848250496048a00e9d70e2f:/IkiWiki/Plugin/skeleton.pm.example

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index 0bd5edeef..30c8dbd5c 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -31,6 +31,7 @@ sub import {
 	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 => "formbuilder", id => "skeleton", call => \&formbuilder);
@@ -181,6 +182,7 @@ sub canedit ($$$) {
 	debug("skeleton plugin running in canedit");
 }
 
+<<<<<<< HEAD:IkiWiki/Plugin/skeleton.pm.example
 sub cansave ($$$$) {
 	my $page=shift;
 	my $content=shift;
@@ -204,6 +206,12 @@ 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 ($$$) {