https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16538
Héctor Eduardo Castro Avalos <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #3 from Héctor Eduardo Castro Avalos <[email protected]> --- Hi Owen Applying: Bug 16538 - Improve the style of progress bars Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt Auto-merging koha-tmpl/intranet-tmpl/prog/css/staff-global.css Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
