[Git][security-tracker-team/security-tracker][master] fix leftover

[Moritz Muehlenhoff (@jmm)]

Moritz Muehlenhoff pushed to branch master at Debian Security Tracker / security-tracker


Commits:
70a69779 by Moritz Muehlenhoff at 2026-11-01T19:56:29+01:00
fix leftover

- - - - -


1 changed file:

- data/CVE/list


Changes:

=====================================
data/CVE/list
=====================================
@@ -1221,12 +1221,8 @@ CVE-2026-119367 (Missing Authorization vulnerability in Liquid Web / StellarWP T
 CVE-2026-119365 (Improper Neutralization of Input During Web Page Generation ('Cross-si ...)
 	NOT-FOR-US: WordPress plugin or theme
 CVE-2026-119364 (ProFTPD through 1.3.9e and 1.3.10rc1 through 1.3.10rc4 contains a link ...)
-<<<<<<< HEAD
 	- proftpd-dfsg <unfixed> (bug #1152788)
-=======
-	- proftpd-dfsg <unfixed>
 	[trixie] - proftpd-dfsg <no-dsa> (Minor issue)
->>>>>>> 5ca8ef9b4d (trixie triage)
 	NOTE: https://github.com/proftpd/proftpd/issues/2374
 	NOTE: Fixed by: https://github.com/proftpd/proftpd/commit/c41691f8981f98081fcb8a535c3c21b06a3f04af (v1.3.10rc5)
 CVE-2026-119300 (Wekan is open source kanban built with Meteor. Prior to 11.11, the use ...)



View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/commit/70a697792d6a2185a573dde7c991cb4b0ae300a2

-- 
View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/commit/70a697792d6a2185a573dde7c991cb4b0ae300a2
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-security-tracker-commits/attachments/20261101/1d960189/attachment.htm>