From 7f0202ab8434eb9865d2357a84c9b28868315ca5 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 4 Aug 2015 14:24:50 +0100 Subject: [PATCH] Bug 10363: FIX rebase conflict error Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- admin/authorised_values.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl index 1cf683d9b6..620ddc7c27 100755 --- a/admin/authorised_values.pl +++ b/admin/authorised_values.pl @@ -60,7 +60,7 @@ if ($op eq 'add_form') { my @branches_loop; foreach my $branchcode ( sort { uc($branches->{$a}->{branchname}) cmp uc($branches->{$b}->{branchname}) } keys %$branches ) { - my $selected = ( grep {$_->{branchcode} eq $branchcode} @$selected_branches ) ? 1 : 0; + my $selected = ( grep {$_ eq $branchcode} @$selected_branches ) ? 1 : 0; push @branches_loop, { branchcode => $branchcode, branchname => $branches->{$branchcode}->{branchname}, -- 2.39.5