From 1d6ef0a4fcbe2e11e5e620fd1a9a2509a9f855ac Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Wed, 13 Nov 2024 14:38:36 +0100 Subject: [PATCH] removed merge conflict --- .github/workflows/ci.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5977b4855..03007bef2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,13 +47,9 @@ jobs: distro: [ "tumbleweed" ] container: -<<<<<<< HEAD image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby -======= - image: registry.opensuse.org/yast/sle-15/sp7/containers/yast-ruby ->>>>>>> a4a03b8c (Adapt files for the SLE-15-SP7 branch) - steps: + steps: - name: Git Checkout uses: actions/checkout@v2 @@ -72,11 +68,7 @@ jobs: distro: [ "tumbleweed" ] container: -<<<<<<< HEAD image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby -======= - image: registry.opensuse.org/yast/sle-15/sp7/containers/yast-ruby ->>>>>>> a4a03b8c (Adapt files for the SLE-15-SP7 branch) steps: - name: Git Checkout @@ -94,11 +86,7 @@ jobs: distro: [ "tumbleweed" ] container: -<<<<<<< HEAD image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby -======= - image: registry.opensuse.org/yast/sle-15/sp7/containers/yast-ruby ->>>>>>> a4a03b8c (Adapt files for the SLE-15-SP7 branch) steps: - name: Git Checkout @@ -118,11 +106,7 @@ jobs: distro: [ "tumbleweed" ] container: -<<<<<<< HEAD image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby -======= - image: registry.opensuse.org/yast/sle-15/sp7/containers/yast-ruby ->>>>>>> a4a03b8c (Adapt files for the SLE-15-SP7 branch) steps: - name: Git Checkout