From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Mon, 14 Mar 2022 09:03:31 +0000 (+0100)
Subject: Merge pull request #18002 from BKPepe/haproxy-conflicts
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=94fb0da32cd2ba5e107841a6b08c230b476ec40d;p=feed%2Fpackages.git

Merge pull request #18002 from BKPepe/haproxy-conflicts

haproxy: Makefile polishing and add conflict to SSL/non-SSL variant
---

94fb0da32cd2ba5e107841a6b08c230b476ec40d