From 2d6cdf427a2d4859ef3bfc0e383becb86be28e6f Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Fri, 10 Jun 2022 14:13:53 +1000
Subject: [PATCH] fix merge

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 .github/workflows/maven-verify.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index 2351864d2b..c544aeaf7a 100644
--- 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'