From 6cd7629a5a4e87485cf533bbcb28cf59fa0a8afe Mon Sep 17 00:00:00 2001
From: Elliott Baron <ebaron@redhat.com>
Date: Mon, 11 Sep 2023 19:07:04 -0400
Subject: [PATCH] Resolve conflicts

Signed-off-by: Elliott Baron <ebaron@redhat.com>
---
 .github/workflows/ci-jobs.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/ci-jobs.yml b/.github/workflows/ci-jobs.yml
index b132e2e135..cfe5d30546 100644
--- a/.github/workflows/ci-jobs.yml
+++ b/.github/workflows/ci-jobs.yml
@@ -56,13 +56,8 @@ jobs:
       with:
         step: restore
     - run: git submodule init
-<<<<<<< HEAD:.github/workflows/ci-jobs.yml
-    - run: git submodule update --remote
-    - run: mvn -B -U clean package
-=======
     - run: git submodule update
-    - run: mvn -B -U -Dbuild.arch=${{ inputs.build-arch }} clean package
->>>>>>> 0d3cbf91 (ci(submodule): don't use remote branch HEAD (#1667)):.github/workflows/ci-build-image.yml
+    - run: mvn -B -U clean package
       env:
         GITHUB_TOKEN_REF: ${{ secrets.GH_PKGS_READ_TOKEN }}
     - name: Save cryostat image