[Koha-bugs] [Bug 10860] In-House Use

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

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

Koha Team Lyon 3 <koha at univ-lyon3.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |koha at univ-lyon3.fr

--- Comment #18 from Koha Team Lyon 3 <koha at univ-lyon3.fr> ---
The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 10860:
<h1>Something went wrong !</h1>Applying: Bug 10860: In-House Use
Using index info to reconstruct a base tree...
<stdin>:1171: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging C4/Circulation.pm
Auto-merging C4/Items.pm
Auto-merging circ/circulation.pl
CONFLICT (content): Merge conflict in circ/circulation.pl
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging installer/data/mysql/sysprefs.sql
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/css/staff-global.css
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
Auto-merging koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
Auto-merging koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc
Failed to merge in the changes.
Patch failed at 0001 Bug 10860: In-House Use
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 10860 - In-House Use

22461 - Bug 10860: In-House Use

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-10860-In-House-Use-_cegfo.patch .

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