https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10662
Andreas Hedström Mace <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #244 from Andreas Hedström Mace <[email protected]> --- Patch doesn't apply for me: Applying: Bug 10662: Build OAI-PMH Harvesting Client Using index info to reconstruct a base tree... M C4/Installer/PerlDependencies.pm M admin/columns_settings.yml M debian/scripts/koha-create M installer/data/mysql/kohastructure.sql M koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc M koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging debian/scripts/koha-create Auto-merging admin/columns_settings.yml CONFLICT (content): Merge conflict in admin/columns_settings.yml Auto-merging C4/Installer/PerlDependencies.pm Failed to merge in the changes. Patch failed at 0001 Bug 10662: Build OAI-PMH Harvesting Client -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
