[Koha-bugs] [Bug 7825] Change OPACItemHolds syspref to be of type Choice, choices being "no", "yes", "force"
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Mon Feb 4 14:52:57 CET 2013
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825
--- Comment #47 from Jonathan Druart <jonathan.druart at biblibre.com> ---
(In reply to comment #42)
> Sorry, Jonathan. I retried on current master, with git bz now:
>
> Applying: Bug 7825: Followup values are 1, 0 or 'force'
> /usr/share/koha/testclone/.git/rebase-apply/patch:32: tab in indent.
> [% IF OPACItemHolds == '1' or OPACItemHolds ==
> 'force' %]
> fatal: sha1 information is lacking or useless
> (koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 Bug 7825: Followup values are 1, 0 or 'force'
>
> Does not apply
Marcel,
I just rebased these patchs because of I got a conflict on the
updatedatabase.pl file. But I didn't get your error.
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list