[Secure-testing-commits] r3712 - data/CVE

[Moritz Muehlenhoff]

Author: jmm-guest
Date: 2006-03-29 22:52:18 +0000 (Wed, 29 Mar 2006)
New Revision: 3712

Modified:
   data/CVE/list
Log:
remove svn mismerge junk


Modified: data/CVE/list
===================================================================
--- data/CVE/list	2006-03-29 22:50:49 UTC (rev 3711)
+++ data/CVE/list	2006-03-29 22:52:18 UTC (rev 3712)
@@ -197,10 +197,6 @@
 	TODO: check
 CVE-1999-1587 (/usr/ucb/ps in Sun Microsystems Solaris 8 and 9, and certain earlier ...)
 	TODO: check
-CVE-2006-XXXX [libimager-perl DoS]
-	- libimager-perl <unfixed> (bug #359661)
-	NOTE: requested ID from Joey
->>>>>>> .r3710
 CVE-2006-1396 (Multiple cross-site scripting (XSS) vulnerabilities in Cholod MySQL ...)
 	TODO: check
 CVE-2006-1395 (SQL injection vulnerability in mb.cgi in Cholod MySQL Based Message ...)