[Git][debian-proftpd-team/proftpd][buster] Series file got broken.

[Hilmar Preuße]

Hilmar Preuße pushed to branch buster at Debian ProFTPD Team / proftpd


Commits:
ad2fa415 by Hilmar Preusse at 2020-04-27T15:19:52+02:00
Series file got broken.

- - - - -


1 changed file:

- debian/patches/series


Changes:

=====================================
debian/patches/series
=====================================
@@ -22,8 +22,5 @@ bug_846_CVE-2019-18217.patch
 upstream_pull_859_861_CVE-2019-19270_CVE-2019-19269
 Issue-903-Ensure-that-we-do-not-reuse-already-destro.patch
 Issue-903-We-want-to-remove-the-data-transfer-comman.patch
-<<<<<<< HEAD
 upstream_pull_657
 upstream_pull_885
-=======
->>>>>>> buster-security



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/ad2fa41531c5d1003e00eac36c11f7db746b82c1

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