Author: jmm-guest Date: 2005-10-24 09:54:59 +0000 (Mon, 24 Oct 2005) New Revision: 2549 Modified: data/CVE/list Log: remove svn merge conflict entry Modified: data/CVE/list ==================================================================--- data/CVE/list 2005-10-24 09:54:08 UTC (rev 2548) +++ data/CVE/list 2005-10-24 09:54:59 UTC (rev 2549) @@ -51,11 +51,6 @@ NOT-FOR-US: HP-UX CVE-2005-XXXX [adduser''s deluser creates backup files with world readable permissions] - adduser 3.77 (bug #331720; low) -<<<<<<< .mine -======-CVE-2005-3300 (The register_globals emulation layer in grab_globals.php for ...) - - phpmyadmin <unfixed> (bug #335306; high) ->>>>>>> .r2547 CVE-2005-XXXX [Pavuk Digest Authentication Buffer Overflow] - pavuk 0.9.33-1 (bug #264684; high) NOTE: second hole mentioned in bug report