http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11944
Paola Rossi <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #18 from Paola Rossi <[email protected]> --- I test against master 3.15.00.26 The second patch doesn't apply: Applying: Bug 11944: replace use of utf8 with Encode Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging Koha/Database.pm CONFLICT (content): Merge conflict in Koha/Database.pm Failed to merge in the changes. This is ./Koha/Database.pm: 60 my $schema = Koha::Schema->connect( 61 "DBI:$db_driver:dbname=$db_name;host=$db_host;port=$db_port", 62 <<<<<<< HEAD 63 $db_user, $db_passwd, $db_opts ); 64 ======= 65 $db_user, $db_passwd ); 66 67 >>>>>>> Bug 11944: replace use of utf8 with Encode 68 return $schema; 69 } -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
