joerg/net
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix rebase

Browse source
This commit is contained in:
Jörg Prante 2023-10-01 08:27:40 +02:00
parent 4a40104cf6
commit 2e5e7248b0
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gradlew vendored
View file

@ -83,12 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
<<<<<<< HEAD
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
=======
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
>>>>>>> 555347a (update to Gradl 8.1.1, fix tests, remove file logging)
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum