1.8

--- Signed-off-by: Peter Kriens <[email protected]> Signed-off-by: Peter Kriens <[email protected]>
bndtools · Jul 14, 2023 · 2825001 · 2825001
1 parent 0d4bf3e
commit 2825001
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.github/workflows/rebuild.yml b/.github/workflows/rebuild.yml
@@ -62,9 +62,15 @@ jobs:
       uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2
       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@749f47bda3e44aa060e82d7b3ef7e40d953bd629
     - name: Build