summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-04-21 21:38:53 -0400
committerJoey Hess <joey@kitenet.net>2010-04-21 21:38:53 -0400
commit32dd388f8dbb1f52a46c40a2e0b9a00eca43f40e (patch)
tree32cd3613ef480fd1010a666a8ebca8cf28625e1b
parent557912c723a6e8df320a3c6dae461956cf893f10 (diff)
indent
-rw-r--r--IkiWiki.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8af290745..0791e1e75 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2221,7 +2221,7 @@ sub merge_influences {
my $anded=shift;
if (! $anded || (($this || %{$this->[1]}) &&
- ($other || %{$other->[1]}))) {
+ ($other || %{$other->[1]}))) {
foreach my $influence (keys %{$other->[1]}) {
$this->[1]{$influence} |= $other->[1]{$influence};
}