[Git][security-tracker-team/security-tracker][master] Fix a stash issue.

[Ola Lundqvist]

Ola Lundqvist pushed to branch master at Debian Security Tracker / security-tracker


Commits:
24e3c0a1 by Ola Lundqvist at 2021-02-26T14:53:17+01:00
Fix a stash issue.

- - - - -


1 changed file:

- data/dla-needed.txt


Changes:

=====================================
data/dla-needed.txt
=====================================
@@ -61,11 +61,7 @@ golang-gogoprotobuf (Ola Lundqvist)
 guacamole-server (Anton Gladky)
   NOTE: 20210217: Note may affect guacamole-client too (see note on security tracker). (lamby)
 --
-<<<<<<< Updated upstream
 jackson-dataformat-cbor (Abhijith PA)
-=======
-jackson-dataformat-cbor (Ola Lundqvist)
->>>>>>> Stashed changes
 --
 libebml (Thorsten Alteholz)
   NOTE: 20210221: testing package



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

-- 
View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/commit/24e3c0a13eedb5469fcb974a8a836fbaf45ab4a1
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/20210226/1d0aff5d/attachment-0001.htm>