summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/vuxml/vuln.xml1
1 files changed, 0 insertions, 1 deletions
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>