[dspam/f16] adjust documentation for 3.10.2

[Nathanael Noblet]

commit 12ed6f6a876a64831c6580588f4cd7767a98ccd6
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Wed May 2 10:03:11 2012 -0600

    adjust documentation for 3.10.2

 dspam-3.9.0-docs.patch |    2 +-
 dspam.spec             |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/dspam-3.9.0-docs.patch b/dspam-3.9.0-docs.patch
index 46f6bb9..acb1eb4 100644
--- a/dspam-3.9.0-docs.patch
+++ b/dspam-3.9.0-docs.patch
@@ -40,6 +40,6 @@
  
 -virtual_transport	= lmtp:unix:/tmp/dspam.sock
 +virtual_transport	= lmtp:unix:/var/run/dspam/dspam.sock
- virtual_mailbox_domains	= example.com
+ virtual_mailbox_domains	= example.org
  virtual_mailbox_maps	= mysql:/etc/postfix/vmailbox.cf
  
diff --git a/dspam.spec b/dspam.spec
index 94daf7c..88c5335 100644
--- a/dspam.spec
+++ b/dspam.spec
@@ -10,13 +10,8 @@
 
 Summary:                A library and Mail Delivery Agent for Bayesian SPAM filtering
 Name:                   dspam
-<<<<<<< HEAD
-Version:                3.10.1
-Release:                6%{?dist}
-=======
 Version:                3.10.2
 Release:                1%{?dist}
->>>>>>> 7accda0... bump upstream version
 License:                GPLv2
 Group:                  System Environment/Daemons
 Source0:                http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz