[Koha-bugs] [Bug 9805] Lost items are un-lost if returned, but not if renewed
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Sun May 8 13:30:04 CEST 2016
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9805
Katrin Fischer <katrin.fischer at bsz-bw.de> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Signed Off |Patch doesn't apply
--- Comment #49 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
This patch no longer applies (see below)
Jonathan, do you oppose to continue testing this as is? Should we discuss more
widely?
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 9805 - Lost items are un-lost if returned, but not if renewed.
Using index info to reconstruct a base tree...
M C4/Circulation.pm
M admin/smart-rules.pl
M installer/data/mysql/kohastructure.sql
M installer/data/mysql/updatedatabase.pl
M koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
M koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging admin/smart-rules.pl
CONFLICT (content): Merge conflict in admin/smart-rules.pl
Auto-merging C4/Circulation.pm
Failed to merge in the changes.
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list