From: Katerina Kubecova <katerina.kubecova@nic.cz>
Date: Fri, 8 Mar 2024 11:19:37 +0000 (+0100)
Subject: Resolve git rebase conflict
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5581de1fdd8d437b166845772d8e4310c34a07c6;p=thirdparty%2Fbird.git

Resolve git rebase conflict
---

5581de1fdd8d437b166845772d8e4310c34a07c6