Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.mvn/settings.xml
  • Loading branch information
Bock4Soft committed Jul 7, 2024
2 parents 567f663 + 0fb1e31 commit bafbc49
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion .mvn/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,5 @@
<username>${env.DOCKER_REGISTRY_USERNAME}</username>
<password>${env.DOCKER_REGISTRY_TOKEN}</password>
</server>

</servers>
</settings>

0 comments on commit bafbc49

Please sign in to comment.