https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19532
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #729 from David Nind <[email protected]> --- Hi Aleisha. Patches no longer apply 8-(... Note: I will make it a priority for me to review and sign-off once it applies again. It would be nice to get all your hard work into master (finally!). Applying: Bug 19532: Database and installer stuff Using index info to reconstruct a base tree... M C4/Auth.pm M Koha/CirculationRules.pm M Makefile.PL M admin/smart-rules.pl M installer/data/mysql/en/mandatory/sample_notices.yml A installer/data/mysql/fr-CA/obligatoire/sample_notices.sql M installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql M installer/data/mysql/kohastructure.sql M installer/data/mysql/mandatory/sysprefs.sql M installer/data/mysql/mandatory/userpermissions.sql A installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql M koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref M koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc CONFLICT (modify/delete): installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql deleted in HEAD and modified in Bug 19532: Database and installer stuff. Version Bug 19532: Database and installer stuff of installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql left in tree. Auto-merging installer/data/mysql/mandatory/userpermissions.sql Auto-merging installer/data/mysql/mandatory/sysprefs.sql Auto-merging installer/data/mysql/kohastructure.sql Auto-merging installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql CONFLICT (content): Merge conflict in installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql CONFLICT (modify/delete): installer/data/mysql/fr-CA/obligatoire/sample_notices.sql deleted in HEAD and modified in Bug 19532: Database and installer stuff. Version Bug 19532: Database and installer stuff of installer/data/mysql/fr-CA/obligatoire/sample_notices.sql left in tree. Auto-merging installer/data/mysql/en/mandatory/sample_notices.yml Auto-merging admin/smart-rules.pl Auto-merging Makefile.PL Auto-merging Koha/CirculationRules.pm Auto-merging C4/Auth.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 19532: Database and installer stuff -- 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/
