https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24429
Séverine Queune <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #7 from Séverine Queune <[email protected]> --- Hi ! There is a conflict applying the patch on master. Applying: Bug 24429: Advanced editor - Add ability to generate an export file as cataloger saves Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/css/cateditor.css M koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc M koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt M tools/export.pl Falling back to patching base and 3-way merge... Auto-merging tools/export.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc Auto-merging koha-tmpl/intranet-tmpl/prog/css/cateditor.css Failed to merge in the changes. Patch failed at 0001 Bug 24429: Advanced editor - Add ability to generate an export file as cataloger saves -- 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/
