diff options
| author | Ola Lundqvist <ola@inguza.com> | 2021-02-26 14:52:42 +0100 |
|---|---|---|
| committer | Ola Lundqvist <ola@inguza.com> | 2021-02-26 14:53:17 +0100 |
| commit | 700b60185e976cde011aa64a417b69439852e960 (patch) | |
| tree | 2982eac897744f7fc2040ac08902601e483bc28f /data/dla-needed.txt | |
| parent | f134bb87d402eafe5517ec55db94bfa6befbc2c7 (diff) | |
Fix a stash issue.
Diffstat (limited to 'data/dla-needed.txt')
| -rw-r--r-- | data/dla-needed.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/data/dla-needed.txt b/data/dla-needed.txt index 34a36028ab..0204521649 100644 --- a/data/dla-needed.txt +++ b/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 |