[Koha-bugs] [Bug 10863] Add 2 circulation permissions: force_checkout and lift_restriction

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

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

--- Comment #30 from Koha Team AMU <koha.aixmarseille at gmail.com> ---
I applied the patch on a sandbox and had the following message :
The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 10863:
<h1>Something went wrong !</h1>Applying: Bug 10863: Add 2 circulation
permissions: force_checkout and lift_restriction
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 10863: Add 2 circulation permissions: force_checkout
and lift_restriction
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.
Bug 10863 - Add 2 circulation permissions: force_checkout and lift_restriction

22717 - Bug 10863: Add 2 circulation permissions: force_checkout and
lift_restriction

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
tmpBug-10863-Add-2-circulation-permissions-forcecheck-Vi1MDW.patch .

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