http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7951 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #2 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Kyle, thx for implementing the system preferences. I tried testing your patch but have a conflict I can't resolve: Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 7951 - Suspending holds needs a system preference /home/katrin/kohaclone/.git/rebase-apply/patch:207: trailing whitespace. $template->param( /home/katrin/kohaclone/.git/rebase-apply/patch:223: trailing whitespace. $template->param( fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 7951 - Suspending holds needs a system preference When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Could you please check what's going wrong and resubmit? Thx! -- You are receiving this mail because: You are watching all bug changes.