summaryrefslogtreecommitdiffstats
path: root/test/integration/test-bug-747261-arch-specific-conflicts (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Adding upstream version 2.6.1.upstream/2.6.1upstreamDaniel Baumann2024-04-071-0/+46
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>