https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24194
Lisette Scheer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] | |m --- Comment #73 from Lisette Scheer <[email protected]> --- Applying: Bug 24194: Add ReserveExpiration system preference to disable expiration date options for reserves Using index info to reconstruct a base tree... M C4/ILSDI/Services.pm M C4/Reserves.pm M Koha/Hold.pm M Koha/REST/V1/Holds.pm M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref M koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt M koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt M koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt M koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt M koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt M koha-tmpl/intranet-tmpl/prog/js/holds.js M koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt M t/db_dependent/Reserves.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Reserves.t CONFLICT (content): Merge conflict in t/db_dependent/Reserves.t Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc Auto-merging koha-tmpl/intranet-tmpl/prog/js/holds.js Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc Auto-merging installer/data/mysql/mandatory/sysprefs.sql Auto-merging Koha/REST/V1/Holds.pm Auto-merging Koha/Hold.pm Auto-merging C4/Reserves.pm Auto-merging C4/ILSDI/Services.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 24194: Add ReserveExpiration system preference to disable expiration date options for reserves -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
