[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

Alex Buckley <alexbuckley at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |alexbuckley at catalyst.net.nz

--- Comment #26 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
Hi Lari  

When applying your patch I got the following merge error on Letters.t file,
(note: as I am using an up to date master branch patch 18413 is already applied
(I double checked to make sure)): 

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
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging C4/Letters.pm
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:
   /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-14723-Additional-delivery-notes-to-messages-Zqwu8p.patch

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