Skip to content

Commit 3495403

Browse files
committed
Merge remote-tracking branch 'github/master'
2 parents e9744a3 + 3ecba42 commit 3495403

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

.github/workflows/tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@ jobs:
6262
uses: actions/setup-java@v4
6363
with:
6464
distribution: 'temurin'
65+
<<<<<<< HEAD
6566
java-version: '17'
67+
=======
68+
java-version: '21'
69+
>>>>>>> github/master
6670

6771
- uses: getgauge/setup-gauge@master
6872
with:

0 commit comments

Comments
 (0)