[ssmtp/el5: 37/37] Apply patch to fix addition of garbage at end of attachments

[wolfy]

commit 9144206ad437ea04eff988123e9e27ecb8b8c371
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Sat Jun 30 03:10:11 2012 +0300

    Apply patch to fix addition of garbage at end of attachments

 ssmtp.spec |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)
---
diff --git a/ssmtp.spec b/ssmtp.spec
index 915c7a6..1c085af 100644
--- a/ssmtp.spec
+++ b/ssmtp.spec
@@ -1,10 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-<<<<<<< HEAD
-Release:	15%{?dist}
-=======
 Release:	18%{?dist}
->>>>>>> master
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPLv2+
@@ -24,11 +20,7 @@ Patch8:		%{name}-authpass.patch
 Patch9:		%{name}-aliases.patch
 Patch10:	%{name}-default-cert-path.patch
 Patch11:	%{name}-standardise.patch
-<<<<<<< HEAD
-
-=======
 Patch12:        %{name}-garbage_writes.patch
->>>>>>> master
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #hack around wrong requires for mutt and mdadm
 %if 0%{?rhel}
@@ -68,10 +60,7 @@ or manage a queue. That belongs on a mail hub with a system administrator.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-<<<<<<< HEAD
-=======
 %patch12 -p1
->>>>>>> master
 
 #add missing libs in orderto fix FTBFS due to changes in implicit DSO linking
 %if "0%{?dist}" >= "0.fc13" 
@@ -164,18 +153,9 @@ fi
 
 
 %changelog
-<<<<<<< HEAD
-=======
 * Sat Jun 30 2012 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 2.61-18
 - Apply patch to fix addition of garbage at end of attachments
 
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.61-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.61-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
->>>>>>> master
 * Tue Jul 27 2010 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 2.61-15
 - fix regression created by the patch for standardise() -- Buffer overflow