[Koha-bugs] [Bug 11944] Cleanup Koha UTF-8

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11944

Paola Rossi <paola.rossi at cineca.it> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |paola.rossi at cineca.it

--- Comment #18 from Paola Rossi <paola.rossi at cineca.it> ---
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.