From 282500127a86721998363064ec521b6b302050e1 Mon Sep 17 00:00:00 2001
From: Peter Kriens <Peter.Kriens@aQute.biz>
Date: Thu, 13 Jul 2023 17:46:00 +0200
Subject: [PATCH] 1.8

---
 Signed-off-by: Peter Kriens <Peter.Kriens@aQute.biz>

Signed-off-by: Peter Kriens <Peter.Kriens@aQute.biz>
---
 .github/workflows/rebuild.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/rebuild.yml b/.github/workflows/rebuild.yml
index 2bd45330577..15360ba76a2 100644
--- 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