[Koha-bugs] [Bug 5841] Routing slip not displaying publication date

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

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

delaye <stephane.delaye at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |stephane.delaye at biblibre.co
                   |                            |m

--- Comment #10 from delaye <stephane.delaye at biblibre.com> ---
I tried applying the patch in a sandbox but i have this message

Applying: Bug 5841: Routing slip not displaying publication date
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 5841: Routing slip not displaying publication date
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.