Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ac01ea4180c25224892ba8a5cfa1d807df67c1af..1e9d1ca2a73d42343534fb582dd50542926b71f1 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2120,10 +2120,7 @@ sub merge_influences {
        }
        else {
                # influence blocker
-               print STDERR "merging $this and $other; found influence blocker\n";
                $this->[1]={};
-               $this->[2]=1;
-               return;
        }
 }