[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6639-g8975dc8

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 8975dc88caa386d64a26c58538616a55365f67a2
Author: Stephen Gran <steve at lobefin.net>
Date:   Tue Feb 15 07:47:30 2011 +0000

    fix the broken configure merge
    
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/libclamav/c++/llvm/configure b/libclamav/c++/llvm/configure
index eb53a25..c6ab72b 100755
--- a/libclamav/c++/llvm/configure
+++ b/libclamav/c++/llvm/configure
@@ -11631,8 +11631,6 @@ fi
 done
 
 
-<<<<<<< HEAD
-=======
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking __crashreporter_info__" >&5
 $as_echo_n "checking __crashreporter_info__... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11660,8 +11658,6 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
->>>>>>> clamav-0.97
-
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HUGE_VAL sanity" >&5

-- 
Debian repository for ClamAV