[dspam/f16: 3/3] update sources

[Nathanael Noblet]

commit ce341799e7e58712b5d84c6db84d4c9c20b6e42a
Merge: 44dc59b 3b1fd9d
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Sun Sep 11 20:37:09 2011 -0600

    update sources

 .gitignore |    1 +
 dspam.spec |   14 +++++++++++++-
 sources    |    2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)
---
diff --cc dspam.spec
index a75238a,206c73e..c1b6de0
--- a/dspam.spec
+++ b/dspam.spec
@@@ -24,6 -24,7 +24,10 @@@ Source6:                dspam-sysconfi
  Source7:				dspam-tmpfiles
  Source8:				dspam-systemd
  Source99:               dspam-filter-requires.sh
++<<<<<<< HEAD
++=======
+ #Patch0:                 dspam-3.9.0-file-name.patch
++>>>>>>> origin/master
  Patch1:                 dspam-3.9.0-docs.patch
  Patch2:                 dspam-3.9.0-dspamsock.patch
  URL:                    http://www.nuclearelephant.com/
@@@ -133,6 -134,7 +137,10 @@@ Web-based interface for DSPAM's powerfu
  %prep
  
  %setup -q
++<<<<<<< HEAD
++=======
+ #%patch0 -p1
++>>>>>>> origin/master
  %patch1 -p0
  %patch2 -p0
  
@@@ -340,6 -342,7 +348,10 @@@ exit 
  
  %files hash
  %defattr(-,root,root,-)
++<<<<<<< HEAD
++=======
+ #%doc README.cssclean
++>>>>>>> origin/master
  %{_libdir}/dspam/libhash_drv.so*
  %{_bindir}/css*