[Koha-bugs] [Bug 6906] show 'Borrower has previously issued $ITEM' alert on checkout
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Sat Aug 9 06:40:10 CEST 2014
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6906
Nick Clemens <nick at quecheelibrary.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |nick at quecheelibrary.org
--- Comment #14 from Nick Clemens <nick at quecheelibrary.org> ---
Applying: Bug 6906 - show 'Borrower has previously...
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/kohastructure.sql
CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql
Auto-merging admin/categorie.pl
CONFLICT (content): Merge conflict in admin/categorie.pl
Auto-merging C4/Circulation.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 6906 - show 'Borrower has previously...
--
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.
More information about the Koha-bugs
mailing list