Add config vm

ONLYOFFICE · Nov 20, 2024 · aecfd00 · aecfd00
1 parent 38663fd
commit aecfd00
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/ci-oci-install.yml b/.github/workflows/ci-oci-install.yml
@@ -77,11 +77,7 @@ jobs:
         run: |
             matrix=$(echo '{
               "include": [
-<<<<<<< HEAD
                 {"execute": '${{ github.event.inputs.fedora40 || true }}', "name": "Fedora40", "os": "fedora-40", "distr": "bento"},
-=======
-                {"execute": '${{ github.event.inputs.ubuntu2204 || true }}', "name": "Ubuntu22.04", "os": "ubuntu2204", "distr": "generic"},
->>>>>>> 444a368b4630dca37a0e9e21cfff0d46fb117c1a
                 {"execute": '${{ github.event.inputs.fedora41 || true }}', "name": "Fedora41", "os": "41-cloud-base", "distr": "fedora"}
               ]
             }' | jq -c '.include')