http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9021 I'm just a bot <gitbot@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |gitbot@bugs.koha-community. | |org --- Comment #21 from I'm just a bot <gitbot@bugs.koha-community.org> --- 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... M C4/Letters.pm M C4/Members.pm M installer/data/mysql/kohastructure.sql M installer/data/mysql/updatedatabase.pl M koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt M koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt M members/memberentry.pl Falling back to patching base and 3-way merge... Auto-merging members/memberentry.pl Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.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 C4/Members.pm CONFLICT (content): Merge conflict in C4/Members.pm Auto-merging C4/Letters.pm Patch failed at 0001 Bug 9021 - Add SMS via email as an alternative to SMS services via SMS::Send drivers The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- You are receiving this mail because: You are watching all bug changes.