[Koha-bugs] [Bug 7986] Export issues

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7986

Paul Poulain <paul.poulain at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Passed QA                   |Patch doesn't apply

--- Comment #25 from Paul Poulain <paul.poulain at biblibre.com> ---
The last patch does not apply

Applying: Bug 7986: Followup: Replace DontExportFields and CsvProfileForExport
fatal: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 7986: Followup: Replace DontExportFields and
CsvProfileForExport
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Patch left in
/tmp/Bug-7986-Followup-Replace-DontExportFields-and-Csv-kNu3V9.patch


Jonathan, note that you can also squash the 3 patches in one, that will be
easier to solve updatedatabase conflict !

-- 
You are receiving this mail because:
You are watching all bug changes.