[Koha-bugs] [Bug 14723] Additional delivery notes to messages

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

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

Mazen Khallaf <mazen.i.khallaf at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |mazen.i.khallaf at gmail.com

--- Comment #38 from Mazen Khallaf <mazen.i.khallaf at gmail.com> ---
Failed to apply the patch in step 4


$ git bz apply 14723
Bug 14723 - Additional delivery notes to messages

105776 - Bug 14723: Additional delivery notes to messages
105777 - Bug 14723: Make delivery notes translatable

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 14723: Additional delivery notes to messages
Using index info to reconstruct a base tree...
M       C4/Letters.pm
M       installer/data/mysql/kohastructure.sql
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
M       t/db_dependent/Letters.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Letters.t
CONFLICT (content): Merge conflict in t/db_dependent/Letters.t
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
Auto-merging installer/data/mysql/kohastructure.sql
CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql
Auto-merging C4/Letters.pm
CONFLICT (content): Merge conflict in C4/Letters.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 14723: Additional delivery notes to messages
The copy of the patch that failed is found in: .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-14723-Additional-delivery-notes-to-messages-h__pEr.patch

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