https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38350
Laura Escamilla <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |Laura.escamilla@bywatersolu | |tions.com --- Comment #2 from Laura Escamilla <[email protected]> --- Ran into some merge issues Bug 38350 - Fix style of sidebar form clear buttons 173938 - Bug 38350: Fix style of sidebar form clear buttons Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 38350: Fix style of sidebar form clear buttons 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/includes/patron-search.inc M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt M koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt M koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt M koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc Auto-merging koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss -- 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/
