http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9021
Thomas Johnson <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #30 from Thomas Johnson <[email protected]> --- I just tried applying this patch and received the below errors. Hopefully it's an error on my end applying the patch. The Koha version that I was applying to is 3.17.00.027. ============================================================================== Applying: Bug 9021 - Add SMS via email as an alternative to SMS services via SMS::Send drivers Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging members/memberentry.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/kohastructure.sql Auto-merging admin/admin-home.pl CONFLICT (content): Merge conflict in admin/admin-home.pl Auto-merging C4/Members.pm Auto-merging C4/Letters.pm Failed to merge in the changes. Patch failed at 0001 Bug 9021 - Add SMS via email as an alternative to SMS services via SMS::Send drivers 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". Bug 9021 - Add SMS via email as an alternative to SMS services via SMS::Send drivers 29927 - Bug 9021 - Add SMS via email as an alternative to SMS services via SMS::Send drivers Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-9021---Add-SMS-via-email-as-an-alternative-to--pOiIVH.patch -- 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/
