Resolve conflicts

Signed-off-by: Elliott Baron <[email protected]>
cryostatio · Sep 11, 2023 · 6cd7629 · 6cd7629
1 parent 70c8df7
commit 6cd7629
Showing 1 changed file with 1 addition and 6 deletions.
diff --git 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