[Koha-bugs] [Bug 11395] Batch modifications for records

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

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

Koha Team Lyon 3 <koha at univ-lyon3.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |koha at univ-lyon3.fr

--- Comment #17 from Koha Team Lyon 3 <koha at univ-lyon3.fr> ---
<h1>Something went wrong !</h1>Applying: Bug 11395: Add a batch record
modification
Applying: Bug 11395: Add links to the new tool page
Applying: Bug 11395: Fix return for ModifyRecordWithTemplate
Applying: Bug 11395: New service to preview a record.
Applying: Bug 11395: DB: Add permission tools_records_batchmod Using index info
to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/de-DE/mandatory/userpermissions.sql
Auto-merging installer/data/mysql/en/mandatory/userpermissions.sql
Auto-merging installer/data/mysql/es-ES/mandatory/userpermissions.sql
Auto-merging installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
Auto-merging installer/data/mysql/it-IT/necessari/userpermissions.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/it-IT/necessari/userpermissions.sql
Auto-merging installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
Auto-merging installer/data/mysql/pl-PL/mandatory/userpermissions.sql
Auto-merging
installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
Auto-merging
installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 11395: DB: Add permission tools_records_batchmod When
you have resolved this problem run git bz apply --continue.

-- 
You are receiving this mail because:
You are watching all bug changes.