From 1753a5a401c22d6508a985164410f7728340e427 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Sat, 11 Nov 2023 16:16:04 -0600
Subject: [PATCH] fix conflicts

---
 jra_nextcloud.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jra_nextcloud.sh b/jra_nextcloud.sh
index 30aa97c..204c04f 100644
--- 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