[Koha-bugs] [Bug 9448] Add separate permission for writing off fees

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

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

I'm just a bot <gitbot at bugs.koha-community.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |gitbot at bugs.koha-community.
                   |                            |org

--- Comment #5 from I'm just a bot <gitbot at bugs.koha-community.org> ---
Applying: Bug 9448 - Add separate permission for writing off fees
Using index info to reconstruct a base tree...
M    installer/data/mysql/de-DE/mandatory/userpermissions.sql
M    installer/data/mysql/en/mandatory/userpermissions.sql
M    installer/data/mysql/es-ES/mandatory/userpermissions.sql
M    installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
M    installer/data/mysql/it-IT/necessari/userpermissions.sql
M    installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
M    installer/data/mysql/pl-PL/mandatory/userpermissions.sql
M    installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
M    installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
M    installer/data/mysql/updatedatabase.pl
M    koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
M    members/boraccount.pl
M    members/mancredit.pl
M    members/maninvoice.pl
M    members/pay.pl
M    members/paycollect.pl
M    members/printinvoice.pl
Falling back to patching base and 3-way merge...
Auto-merging members/printinvoice.pl
CONFLICT (content): Merge conflict in members/printinvoice.pl
Auto-merging members/paycollect.pl
Auto-merging members/pay.pl
Auto-merging members/maninvoice.pl
Auto-merging members/mancredit.pl
CONFLICT (content): Merge conflict in members/mancredit.pl
Auto-merging members/boraccount.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging
installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
Auto-merging
installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
Auto-merging installer/data/mysql/pl-PL/mandatory/userpermissions.sql
Auto-merging installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
Auto-merging installer/data/mysql/it-IT/necessari/userpermissions.sql
Auto-merging installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
Auto-merging installer/data/mysql/es-ES/mandatory/userpermissions.sql
Auto-merging installer/data/mysql/en/mandatory/userpermissions.sql
Auto-merging installer/data/mysql/de-DE/mandatory/userpermissions.sql
Patch failed at 0001 Bug 9448 - Add separate permission for writing off fees
The copy of the patch that failed is found in:
   /home/christopher/git/koha/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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