fix merge

Signed-off-by: Olivier Lamy <olamy@apache.org>
apache · Jun 10, 2022 · 2d6cdf4 · 2d6cdf4
1 parent c55a9cd
commit 2d6cdf4
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
@@ -26,7 +26,6 @@ jobs:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2
     with:
-<<<<<<< HEAD
       jdk-matrix: '[ "8", "11", "17", "18" ]'
       ff-jdk: '18'
       ff-goal: 'clean install site site:stage -P reporting -nsu -T3'