Merge branch 'pmconfig' of https://github.com/GhostWriters/DockSTARTer into pmconfig

Author: CLHatch

.includes/cmdline.sh

@@ -379,13 +379,6 @@ run_command() {
         ["--add"]="appvars_create"
         ["-c"]="docker_compose"
         ["--compose"]="docker_compose"
-<<<<<<< HEAD
-<<<<<<< HEAD
-        ["--config-pm"]="config_package_manager"]
-=======
->>>>>>> 9875f82e412f3f9f3f7c185b34b7f3c49c919efa
-=======
->>>>>>> 9875f82e412f3f9f3f7c185b34b7f3c49c919efa
         ["--config-pm-list"]="package_manager_list"
         ["--config-pm-table"]="package_manager_table"
         ["--config-pm-existing-list"]="package_manager_existing_list"
@@ -467,13 +460,6 @@ run_command() {
         ["-a"]=1
         ["--add"]=1
         ["-e"]=1
-<<<<<<< HEAD
-<<<<<<< HEAD
-        ["--config-pm"]=1
-=======
->>>>>>> 9875f82e412f3f9f3f7c185b34b7f3c49c919efa
-=======
->>>>>>> 9875f82e412f3f9f3f7c185b34b7f3c49c919efa
         ["--config-pm-list"]=1
         ["--config-pm-table"]=1
         ["--config-pm-existing-list"]=1
@@ -489,13 +475,6 @@ run_command() {
     CommandTitle+=(
         ["-a"]="Add Application"
         ["--add"]="Add Application"
-<<<<<<< HEAD
-<<<<<<< HEAD
-        ["--config-pm"]="Select package manager"]
-=======
->>>>>>> 9875f82e412f3f9f3f7c185b34b7f3c49c919efa
-=======
->>>>>>> 9875f82e412f3f9f3f7c185b34b7f3c49c919efa
         ["--config-pm-list"]="List known package managers"
         ["--config-pm-table"]="List known package managers"
         ["--config-pm-existing-list"]="List existing package managers"
@@ -722,13 +701,6 @@ run_command() {
             ;;
         -a | --add) ;&
         -c | --compose) ;&
-<<<<<<< HEAD
-<<<<<<< HEAD
-        --config-pm) ;&
-=======
->>>>>>> 9875f82e412f3f9f3f7c185b34b7f3c49c919efa
-=======
->>>>>>> 9875f82e412f3f9f3f7c185b34b7f3c49c919efa
         --config-pm-list | --config-pm-table) ;&
         --config-pm-existing-list | --config-pm-existing-table) ;&
         -e | --env) ;&

.includes/usage.sh

@@ -108,21 +108,6 @@ ${C["UsageCommand"]-}-c --compose${NC-} < ${C["UsageOption"]-}generate${NC-} | $
     Generates the '${C["UsageFile"]-}docker-compose.yml${NC-} file
 EOF
             ;;&
-<<<<<<< HEAD
-<<<<<<< HEAD
-        --config-pm)
-            Found=1
-            cat << EOF
-${C["UsageCommand"]-}--config-pm${NC-}
-    Re-applies the current theme to the GUI
-${C["UsageCommand"]-}-T --config-pm${NC-} ${C["UsageOption"]-}<package manager>${NC-}
-    Selects the package manager to install dependencies with
-EOF
-            ;;&
-=======
->>>>>>> 9875f82e412f3f9f3f7c185b34b7f3c49c919efa
-=======
->>>>>>> 9875f82e412f3f9f3f7c185b34b7f3c49c919efa
         --config-pm-list | "")
             Found=1
             cat << EOF