Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	web/package-lock.json
#	web/package.json
  • Loading branch information
jendib committed Dec 30, 2023
2 parents 6182b49 + 5fcf7ed commit 05a3721
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: "21"
distribution: "temurin"
Expand Down

0 comments on commit 05a3721

Please sign in to comment.