[Koha-bugs] [Bug 16787] 'Too many holds' message appears inappropriately and is missing data

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16787

Victor Grousset/tuxayo <victor.grousset at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |victor.grousset at biblibre.co
                   |                            |m

--- Comment #9 from Victor Grousset/tuxayo <victor.grousset at biblibre.com> ---
conflicts:

~/d/koha ❯❯❯ git bz apply 16787
Bug 16787 - 'Too many holds' message appears inappropriately and is missing
data

68894 - Bug 16787: 'Too many holds' message appears inappropriately and is
missing data
68895 - Bug 16787: Add tests

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 16787: 'Too many holds' message appears inappropriately and is
missing data
Using index info to reconstruct a base tree...
M       C4/Reserves.pm
M       koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
M       reserve/request.pl
Falling back to patching base and 3-way merge...
Auto-merging reserve/request.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
Auto-merging C4/Reserves.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 16787: 'Too many holds' message appears
inappropriately and is missing data
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-16787-Too-many-holds-message-appears-inappropr-CKsj5R.patch

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