[Koha-bugs] [Bug 7376] Transfer limits should be checked at check-in

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

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

Séverine Queune <severine.queune at bulac.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |severine.queune at bulac.fr

--- Comment #72 from Séverine Queune <severine.queune at bulac.fr> ---
The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 7376:
<h1>Something went wrong !</h1>Applying: Bug 7376 Transfer limits should be
checked at check-in
Warning: commit message did not conform to UTF-8.
You may want to amend it after fixing the message, or set the config
variable i18n.commitencoding to the encoding your project uses.
Applying: Bug 7376: Refactoring subroutines
Using index info to reconstruct a base tree...
M       C4/Circulation.pm
Falling back to patching base and 3-way merge...
Auto-merging C4/Circulation.pm
CONFLICT (content): Merge conflict in C4/Circulation.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 7376: Refactoring subroutines
The copy of the patch that failed is found in: .git/rebase-apply/patch

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