merge failed

--- Signed-off-by: Peter Kriens <[email protected]> Signed-off-by: Peter Kriens <[email protected]>
bndtools · Sep 5, 2023 · 4f5ec58 · 4f5ec58
1 parent f378c6b
commit 4f5ec58
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
@@ -45,7 +45,7 @@ jobs:
         os:
         - 'ubuntu-latest'
         java:
-        - '17'
+        - '20'
         runner:
         - '{0}' # 'xvfb-run --auto-servernum {0}'
         include:

diff --git a/.github/workflows/rebuild.yml b/.github/workflows/rebuild.yml
@@ -62,15 +62,9 @@ jobs:
       uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2
       with:
         distribution: 'temurin'
-<<<<<<< HEAD
         java-version: |
           8
           ${{ matrix.java }}
-=======
-        java-version:  |
-            8
-            ${{ matrix.java }}
->>>>>>> 655ea9bc6 (1.8)
     - name: Set up Gradle
       uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc
     - name: Build