fix conflicts
This commit is contained in:
parent
c633c11149
commit
1753a5a401
|
@ -117,6 +117,9 @@ else
|
||||||
apt-get update -q2
|
apt-get update -q2
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> 42703a0 (jra_nextcloud.sh: fix add gpgp key function and add install available version pacjage)
|
||||||
while [[ "$ANS_NCD" != "yes" ]]
|
while [[ "$ANS_NCD" != "yes" ]]
|
||||||
do
|
do
|
||||||
read -p "> Please set your domain (or subdomain) here for Nextcloud: (e.g.: cloud.domain.com)$NL" -r NC_DOMAIN
|
read -p "> Please set your domain (or subdomain) here for Nextcloud: (e.g.: cloud.domain.com)$NL" -r NC_DOMAIN
|
||||||
|
|
Loading…
Reference in New Issue