https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3150
shi-yao.w...@inlibro.com changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |shi-yao.w...@inlibro.com Status|Needs Signoff |Patch doesn't apply --- Comment #75 from shi-yao.w...@inlibro.com --- Merge conflict when applying 27266: Falling back to patching base and 3-way merge... Auto-merging virtualshelves/sendshelf.pl CONFLICT (content): Merge conflict in virtualshelves/sendshelf.pl Auto-merging t/db_dependent/Koha/Biblio.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/Biblio.t Auto-merging t/Biblio.t Auto-merging opac/opac-sendshelf.pl CONFLICT (content): Merge conflict in opac/opac-sendshelf.pl Auto-merging opac/opac-sendbasket.pl CONFLICT (content): Merge conflict in opac/opac-sendbasket.pl Auto-merging opac/opac-detail.pl Auto-merging opac/opac-basket.pl CONFLICT (content): Merge conflict in opac/opac-basket.pl Auto-merging basket/sendbasket.pl CONFLICT (content): Merge conflict in basket/sendbasket.pl Auto-merging basket/basket.pl CONFLICT (content): Merge conflict in basket/basket.pl Auto-merging Koha/Biblio.pm CONFLICT (content): Merge conflict in Koha/Biblio.pm Auto-merging C4/Biblio.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 27266: Move GetMarcAuthors to Koha namespace -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/