Fix regression in v-list-sys-config

Author: Kristan Kenney

bin/v-list-sys-config

@@ -69,12 +69,9 @@ json_list() {
         "INACTIVE_SESSION_TIMEOUT": "'$INACTIVE_SESSION_TIMEOUT'",
         "PHPMYADMIN_KEY": "'$PHPMYADMIN_KEY'",
         "ENFORCE_SUBDOMAIN_OWNERSHIP": "'$ENFORCE_SUBDOMAIN_OWNERSHIP'",
-<<<<<<< HEAD
-        "DEBUG_MODE": "'$DEBUG_MODE'"
-=======
+        "DEBUG_MODE": "'$DEBUG_MODE'",
         "API": "'$API'",
         "API_ALLOWED_IP": "'$API_ALLOWED_IP'"
->>>>>>> main
     }
     }'
 }
@@ -159,7 +156,7 @@ shell_list() {
     fi
     if [ ! -z "$API" ]; then
     echo "API enabled:             $API"
-    echo "Allowed IPS:             $API_ALLOWED_IP"
+    echo "API allowed IP's:             $API_ALLOWED_IP"
 
     fi
 
@@ -188,11 +185,7 @@ plain_list() {
     echo -ne "$FILE_MANAGER\t$REPOSITORY\t$VERSION\t$DEMO_MODE\t$RELEASE_BRANCH\t"
     echo -ne "$SMTP_RELAY_HOST\t$SMTP_RELAY_PORT\t$SMTP_RELAY_USER\t"
     echo -ne "$UPGRADE_SEND_EMAIL\t$UPGRADE_SEND_EMAIL_LOG\t$THEME\t$LANGUAGE\t$BACKUP_GZIP\t"
-<<<<<<< HEAD
-    echo -e  "$BACKUP\t$WEBMAIL_ALIAS\t$DB_PMA_URL\t$DB_PGA_URL\t$DEBUG_MODE"
-=======
-    echo -e  "$BACKUP\t$WEBMAIL_ALIAS\t$DB_PMA_URL\t$DB_PGA_URL\t$API\t$API_ALLOWED_IP"
->>>>>>> main
+    echo -e  "$BACKUP\t$WEBMAIL_ALIAS\t$DB_PMA_URL\t$DB_PGA_URL\t\t$DEBUG_MODE\t$API\t$API_ALLOWED_IP"
 }
 
 
@@ -209,11 +202,7 @@ csv_list() {
     echo -n "'SMTP_RELAY','SMTP_RELAY_HOST','SMTP_RELAY_PORT','SMTP_RELAY_USER',"
     echo -n "'UPGRADE_SEND_EMAIL','UPGRADE_SEND_EMAIL_LOG',"
     echo -n "'THEME', 'LANGUAGE','BACKUP_GZIP','BACKUP','WEBMAIL_ALIAS',"
-<<<<<<< HEAD
-    echo -n "'DB_PMA_ALIAS','DB_PGA_ALIAS','DEBUG_MODE'"
-=======
-    echo -n "'DB_PMA_ALIAS','DB_PGA_ALIAS','API','API_ALLOWED_IP'"
->>>>>>> main
+    echo -n "'DB_PMA_ALIAS','DB_PGA_ALIAS','DEBUG_MODE','API','API_ALLOWED_IP'"
     echo
     echo -n "'$WEB_SYSTEM','$WEB_RGROUPS','$WEB_PORT','$WEB_SSL',"
     echo -n "'$WEB_SSL_PORT','$WEB_BACKEND','$PROXY_SYSTEM','$PROXY_PORT',"
@@ -224,14 +213,9 @@ csv_list() {
     echo -n "'$REPOSITORY', '$VERSION','$DEMO_MODE','$RELEASE_BRANCH',"
     echo -n "'$SMTP_RELAY','$SMTP_RELAY_HOST','$SMTP_RELAY_PORT','$SMTP_RELAY_USER',"
     echo -n "'$UPGRADE_SEND_EMAIL','$UPGRADE_SEND_EMAIL_LOG','$THEME','$LANGUAGE',"
-<<<<<<< HEAD
-    echo -n "'$BACKUP_GZIP','$BACKUP','$WEBMAIL_ALIAS','$DB_PMA_URL','$DB_PGA_URL',"
-    echo -n "'$DEBUG_MODE'"
-=======
     echo -n "'$BACKUP_GZIP','$BACKUP','$WEBMAIL_ALIAS','$DB_PMA_URL','$DB_PGA_URL'"
-    echo -n "'$API','$API_ALLOWED_IP'"
+    echo -n "'$DEBUG_MODE','$API','$API_ALLOWED_IP'"
 
->>>>>>> main
     echo
 }