From: Patrick Donnelly <pdonnell@ibm.com>
Date: Wed, 1 Apr 2026 23:38:58 +0000 (-0400)
Subject: qa: remove file from silent conflict
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a600cdf97381b99320fc0eadba3989cbd6b75907;p=ceph.git

qa: remove file from silent conflict

Added back by 2755bec58f6b659fa46c8d717c895ee4fa4270d0.

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
---

diff --git a/qa/distros/supported-random-distro$/centos_9.stream.yaml b/qa/distros/supported-random-distro$/centos_9.stream.yaml
deleted file mode 120000
index 38fea53ed699..000000000000
--- a/qa/distros/supported-random-distro$/centos_9.stream.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../all/centos_9.stream.yaml
\ No newline at end of file