https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35659
--- Comment #17 from Michal Denar <[email protected]> --- Hi, I get an error when I try to apply the patch: Bug 35659 - OAI Harvester 160357 - DO NOT PUSH: Bug 35659 DBIC Update 161813 - Bug 35659: OAI Harvester Apply? [(y)es, (n)o, (i)nteractive] y Applying: DO NOT PUSH: Bug 35659 DBIC Update Applying: Bug 35659: OAI Harvester Using index info to reconstruct a base tree... M installer/data/mysql/mandatory/sysprefs.sql M installer/data/mysql/mandatory/userpermissions.sql M koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc M koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc Auto-merging installer/data/mysql/mandatory/userpermissions.sql Auto-merging installer/data/mysql/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/mandatory/sysprefs.sql error: Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
