[Koha-bugs] [Bug 5356] Shipping billing addess improvements

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |katrin.fischer at bsz-bw.de

--- Comment #13 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Tried testing this together with 7302 and directly on master, but in both cases
patch does not apply.

Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 5356: delivery place and billing place centralised in basket
management
fatal: sha1 information is lacking or useless (C4/Acquisition.pm).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 5356: delivery place and billing place centralised in
basket management
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".

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.