urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix previous buggy merge

master
intrigeri 2009-01-18 00:45:46 +01:00
parent e9e75f5f29
commit 73a7bd2f68
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/Plugin/skeleton.pm.example
View File

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