fix conflicts

2023-11-11 16:16:04 -06:00 · 2023-11-11 16:16:04 -06:00 · 1753a5a401
parent c633c11149
commit 1753a5a401
1 changed files with 3 additions and 0 deletions
--- a/jra_nextcloud.sh
+++ b/jra_nextcloud.sh
@ -117,6 +117,9 @@ else
    apt-get update -q2
 fi
 }
+=======
+
+>>>>>>> 42703a0 (jra_nextcloud.sh: fix add gpgp key function and add install available version pacjage)
 while [[ "$ANS_NCD" != "yes" ]]
 do
  read -p "> Please set your domain (or subdomain) here for Nextcloud: (e.g.: cloud.domain.com)$NL" -r NC_DOMAIN