https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39565
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|[email protected] |[email protected] |y.org | CC| |[email protected] Status|Signed Off |Failed QA Text to go in the| |This enhancement moves the release notes| |OPACVirtualCard system | |preferences | |(OPACVirtualCard and | |OPACVirtualCardBarcode) | |from the OPAC suggestion | |section to the OAPC | |features section. --- Comment #4 from David Nind <[email protected]> --- I thought I would have a go at QAing this one as I understand the code for this one! The patch no longer applies 8-(... Once the patch applies again, could you amend the commit message to follow the guidelines? https://wiki.koha-community.org/wiki/Commit_messages - Subject line: Bug 39565: .... - Maybe the title for the commit message should be "Move OPACVirtualCard system preferences to the correct section" David git bz apply 39565 Bug 39565 - OPACVirtualCard system preferences should not be in Suggestions section 180729 - Bug 39565 - OPACVirtualCard system preferences should not be in Suggestions section Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 39565 - OPACVirtualCard system preferences should not be in Suggestions section Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref error: Failed to merge in the changes. Patch failed at 0001 Bug 39565 - OPACVirtualCard system preferences should not be in Suggestions section -- 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/
