tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

resolved conflict

Browse Source
This commit is contained in:
Daniel Maya 2021-11-24 17:46:23 +01:00
parent 3cc3cef7fa
commit 0d2e4a99a3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_server/util/pandora_manage.pl
View File

@ -1003,7 +1003,7 @@ sub pandora_get_calendar_id ($$) {
sub pandora_get_same_day_id ($$) {
my ($dbh, $same_day) = @_;
my %weeks = ('monday' => 1, 'tuesday' => 2, 'wednesday' => 3, 'thursday' => 4, 'friday' => 5, 'saturday' => 6, 'sunday' => 7, 'holiday' => 8);
my $weeks = { 'monday' => 1, 'tuesday' => 2, 'wednesday' => 3, 'thursday' => 4, 'friday' => 5, 'saturday' => 6, 'sunday' => 7, 'holiday' => 8 };
return defined ($weeks->{$same_day}) ? $weeks->{$same_day} : -1;
}
@ -5531,7 +5531,7 @@ sub cli_get_agents() {
my $head_print = 0;
use Data::Dumper;
# use Data::Dumper;
foreach my $agent (@agents) {