https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29897
Hugo Agud <ha...@orex.es> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #6 from Hugo Agud <ha...@orex.es> --- Bug 29897 - Display author identifiers for researchers 129816 - Bug 29897: Rename get_marc_authors with get_marc_contributors 129817 - Bug 29897: Move code to private method for reusability 129818 - Bug 29897: Add new pref OPACAuthorIdentifiers 129819 - Bug 29897: Display author's identifiers Applying: Bug 29897: Rename get_marc_authors with get_marc_contributors Using index info to reconstruct a base tree... M Koha/Biblio.pm M basket/basket.pl M basket/sendbasket.pl M opac/opac-basket.pl M opac/opac-sendbasket.pl M opac/opac-sendshelf.pl M t/db_dependent/Koha/Biblio.t M virtualshelves/sendshelf.pl Falling back to patching base and 3-way merge... Auto-merging virtualshelves/sendshelf.pl Auto-merging t/db_dependent/Koha/Biblio.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/Biblio.t Auto-merging opac/opac-basket.pl Auto-merging basket/basket.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 29897: Rename get_marc_authors with get_marc_contributors [33mhint: Use 'git am --show-current-patch=diff' to see the failed patch[m 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". Patch left in /tmp/Bug-29897-Rename-getmarcauthors-with-getmarccontri-5Xn3sp.patch Apply? [(y)es, (n)o, (i)nteractive] DEV atomic update /kohadevbox/koha/installer/data/mysql/atomicupdate/bug_29897.pl [10:24:08]: Bug 29897 - Add new system preference OPACAuthorIdentifiers -- 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/