https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39274
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #5 from David Nind <[email protected]> --- The patch no longer applies 8-(... git bz apply 39274 Bug 39274 - Non public notes are low contrast in the issues table - Previous checkouts 179389 - Bug 39274: Non public notes are low contrast in the issues table - Previous checkouts Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 39274: Non public notes are low contrast in the issues table - Previous checkouts Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss M koha-tmpl/intranet-tmpl/prog/en/modules/about.tt M koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt M koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/about.tt Auto-merging koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss error: Failed to merge in the changes. Patch failed at 0001 Bug 39274: Non public notes are low contrast in the issues table - Previous checkouts Testing notes (using KTD): 1. For claim returned testing: - Set a value for the ClaimReturnedLostValue system preference - On the patron's check out section, change the columns so that the "Return claimed" one is selected, then the "Claim returned" button is shown 2. Tools home page - tags: - To show the badge for tags requring moderation, set the TagsModeration system preference to "Require" -- 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/
