[Koha-bugs] [Bug 8897] Optional GnuPG encryption of outgoing emails

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8897

I'm just a bot <gitbot at bugs.koha-community.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
   When did the bot|2013-09-24 00:00:00         |2013-10-25
    last check this|                            |

--- Comment #36 from I'm just a bot <gitbot at bugs.koha-community.org> ---
Applying: Bug 8897 [ENH] GPG Mail encryption -- New version
Using index info to reconstruct a base tree...
M    C4/Installer/PerlDependencies.pm
M    C4/Letters.pm
M    debian/control
M    install_misc/debian.packages
M    opac/opac-sendshelf.pl
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-sendshelf.pl
CONFLICT (content): Merge conflict in opac/opac-sendshelf.pl
Auto-merging install_misc/debian.packages
Auto-merging debian/control
CONFLICT (content): Merge conflict in debian/control
Auto-merging C4/Letters.pm
CONFLICT (content): Merge conflict in C4/Letters.pm
Auto-merging C4/Installer/PerlDependencies.pm
CONFLICT (content): Merge conflict in C4/Installer/PerlDependencies.pm
Patch failed at 0001 Bug 8897 [ENH] GPG Mail encryption -- New version
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.