https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23531
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #14 from David Nind <[email protected]> --- Sorry Arthur, patch no longer applies! Applying: Bug 23531: fix ILSDI non-implemented but documented parameters Using index info to reconstruct a base tree... M C4/ILSDI/Services.pm M koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt M opac/ilsdi.pl Falling back to patching base and 3-way merge... Auto-merging opac/ilsdi.pl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt Auto-merging C4/ILSDI/Services.pm CONFLICT (content): Merge conflict in C4/ILSDI/Services.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 23531: fix ILSDI non-implemented but documented parameters -- 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/
