[Koha-bugs] [Bug 21571] Translate notices fail on ACCTDETAILS

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

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

Hugo Agud <hagud at orex.es> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #2 from Hugo Agud <hagud at orex.es> ---
80656 - Bug 21571: Make ACCTDETAILS translatable

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 21571: Make ACCTDETAILS translatable
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
        C4/Letters.pm
Please, commit your changes or stash them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0001 Bug 21571: Make ACCTDETAILS translatable
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.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-21571-Make-ACCTDETAILS-translatable-hKZVxD.patch

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