From: Michael Schroeder <mls@suse.de>
Date: Fri, 7 Jun 2024 09:31:45 +0000 (+0200)
Subject: Merge pull request #565 from bmwiedemann/conflict
X-Git-Tag: 0.7.30~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36791272b773dd927829b53abca55ce9fc7a7046;p=thirdparty%2Flibsolv.git

Merge pull request #565 from bmwiedemann/conflict

Add a Conflicts in libsolv-tools-base
---

36791272b773dd927829b53abca55ce9fc7a7046