https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8628
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #69 from Katrin Fischer <katrin.fisc...@bsz-bw.de> --- Hi Aleisha, this no longer applies, can you please rebase and run QA tools on the set? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 8628: Digital signs - db changes Using index info to reconstruct a base tree... M installer/data/mysql/kohastructure.sql M installer/data/mysql/sysprefs.sql Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql error: Failed to merge in the changes. Patch failed at 0001 Bug 8628: Digital signs - db changes Use 'git am --show-current-patch' to see the failed patch 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-8628-Digital-signs---db-changes-T0d215.patch -- 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/