[Koha-bugs] [Bug 24429] Advanced editor - Add ability to generate an export file as cataloger saves

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24429

Séverine Queune <severine.queune at bulac.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |severine.queune at bulac.fr

--- Comment #7 from Séverine Queune <severine.queune at bulac.fr> ---
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.