Merge pull request #18002 from BKPepe/haproxy-conflicts
authorJosef Schlehofer <pepe.schlehofer@gmail.com>
Mon, 14 Mar 2022 09:03:31 +0000 (10:03 +0100)
committerGitHub <noreply@github.com>
Mon, 14 Mar 2022 09:03:31 +0000 (10:03 +0100)
haproxy: Makefile polishing and add conflict to SSL/non-SSL variant


Trivial merge