[Koha-bugs] [Bug 29058] Add option to not load existing holds table automatically

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #7 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Can you please rebase?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 29058: Add 'Always show holds' checkbox to request.pl
Using index info to reconstruct a base tree...
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
error: Failed to merge in the changes.
Patch failed at 0001 Bug 29058: Add 'Always show holds' checkbox to request.pl
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-29058-Add-Always-show-holds-checkbox-to-reques-gBYoJH.patch

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