[Koha-bugs] [Bug 30879] Add option to sort components by biblionumber

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #24 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
We need a rebase here please!

Applying: Bug 30327: Add options for sorting components
Using index info to reconstruct a base tree...
M       Koha/Biblio.pm
M       catalogue/detail.pl
M       installer/data/mysql/mandatory/sysprefs.sql
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
M       koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
M       opac/opac-detail.pl
M       t/db_dependent/Koha/Biblio.t
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/mandatory/sysprefs.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/mandatory/sysprefs.sql
CONFLICT (add/add): Merge conflict in
installer/data/mysql/atomicupdate/bug_30327_add_sortComponents_syspref.pl
Auto-merging
installer/data/mysql/atomicupdate/bug_30327_add_sortComponents_syspref.pl
Auto-merging Koha/Biblio.pm
CONFLICT (content): Merge conflict in Koha/Biblio.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 30327: Add options for sorting components

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