[Koha-bugs] [Bug 9692] Add a checkbox to display statistical fields in basket.tt

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |severine.queune at bulac.fr

--- Comment #12 from Séverine Queune <severine.queune at bulac.fr> ---
Second patch doesn't apply.

Apply? [(y)es, (n)o, (i)nteractive] i
Applying: Bug 9692: [FOLLOWUP] Add a checkbox to display statistical fields in
basket.tt
fatal: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 9692: [FOLLOWUP] Add a checkbox to display statistical
fields in basket.tt
The copy of the patch that failed is found in:
   /var/repositories/koha/.git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-9692-FOLLOWUP-Add-a-checkbox-to-display-statis-W5i0Tj.patch

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