[Git][security-tracker-team/security-tracker][master] Remove markers from a merge conflict

[Salvatore Bonaccorso (@carnil)]

Salvatore Bonaccorso pushed to branch master at Debian Security Tracker / security-tracker


Commits:
51a6bfc9 by Salvatore Bonaccorso at 2022-05-01T08:16:53+02:00
Remove markers from a merge conflict

- - - - -


1 changed file:

- data/dla-needed.txt


Changes:

=====================================
data/dla-needed.txt
=====================================
@@ -48,14 +48,11 @@ debian-security-support (Utkarsh)
   NOTE: 20220402: context: https://lists.debian.org/debian-lts/2022/04/msg00000.html (Beuc)
   NOTE: 20220419: backport prepped, will contact Holger for more details. (utkarsh)
 --
-<<<<<<< HEAD
-=======
 epiphany-browser
   NOTE: 20220422: programming language C
   NOTE: 20220422: please try to reproduce and be careful with the patch applying.
   NOTE: 20220422: It cannot be applied one-to-one, but affected lines can be found. (Anton)
 --
->>>>>>> 5e4c78dd14 (LTS: Add programming-language-note to some packages)
 firmware-nonfree
   NOTE: 20210731: WIP: https://salsa.debian.org/lts-team/packages/firmware-nonfree
   NOTE: 20210828: Most CVEs are difficult to backport. Contacted Ben regarding possible "ignore" tag



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

-- 
View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/commit/51a6bfc91113479c4252c7282fe37d5f5cf8f7ff
You're receiving this email because of your account on salsa.debian.org.


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