From 5eb6ed944bf61afaf94c7d535d1bae9dd62e7744 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Wed, 13 Dec 2006 07:04:45 +0000
Subject: - Fix tnftpd entry (made validate happy)

---
 security/vuxml/vuln.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml
index eaa5484faaa0..20514bbce0af 100644
--- a/security/vuxml/vuln.xml
+++ b/security/vuxml/vuln.xml
@@ -34,7 +34,6 @@ Note:  Please add new entries to the beginning of this file.
 
 -->
 <vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
-<<<<<<< vuln.xml
   <vuln vid="e969e6cb-8911-11db-9d01-0016179b2dd5">
     <topic>tnftpd -- Remote root Exploit</topic>
     <affects>
-- 
cgit v1.2.3