X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e9e75f5f29d78b0631f98d9b0fa93184fcb181fe..a3726968bc13f19f458c372cbd7cf92ae4c6fce5:/IkiWiki/Plugin/skeleton.pm.example

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 ($$$) {