fix merge bugs

a

.github/workflows/version-check.sh

@@ -1,11 +1,6 @@
-<<<<<<< HEAD
-version=$(grep "version=" linuxgsm.sh | sed -e 's/version//g'| tr -d '="')
-modulesversion=$(grep "modulesversion=" lgsm/modules/core_modules.sh | sed -e 's/modulesversion//g'| tr -d '="')
-=======
 #!/bin/bash
 version=$(grep "version=" linuxgsm.sh | sed -e 's/version//g' | tr -d '="')
-modulesversion=$(grep "modulesversion=" lgsm/functions/core_functions.sh | sed -e 's/modulesversion//g' | tr -d '="')
+modulesversion=$(grep "modulesversion=" lgsm/modules/core_modules.sh | sed -e 's/modulesversion//g' | tr -d '="')
->>>>>>> develop
 
 if [ "${version}" != "${modulesversion}" ]; then
 	echo "Error! LinuxGSM version mismatch"

lgsm/modules/README.md

@@ -3,19 +3,6 @@
 These modules are scripts that are called upon by the primary script linuxgsm.sh
 
 ## Module Names
-<<<<<<< HEAD:lgsm/modules/README.md
-Modules have been named to give an idea of what the module does.
-
-* core: Essential modules that will always run first.
-* command: Primary command module.
-* check: Runs checks that will either halt on or fix an issue.
-* dev: development modules.
-* fix: Applies a game server specific fix.
-* info: retrieves information from a source such as config file or the OS.
-* install: modules related to the installer.
-* monitor: modules related to monitor.
-* update: modules that update the game server.
-=======
 
 Modules have been named to give an idea of what the function does.
 
@@ -28,4 +15,3 @@ Modules have been named to give an idea of what the function does.
 -   install: modules related to the installer.
 -   monitor: modules related to monitor.
 -   update: modules that update the game server.
->>>>>>> develop:lgsm/functions/README.md

lgsm/modules/command_monitor.sh

@@ -83,15 +83,9 @@ fn_monitor_check_queryport() {
 	fi
 }
 
-<<<<<<< HEAD:lgsm/modules/command_monitor.sh
 fn_query_gsquery() {
 	if [ ! -f "${modulesdir}/query_gsquery.py" ]; then
 		fn_fetch_file_github "lgsm/modules" "query_gsquery.py" "${modulesdir}" "chmodx" "norun" "noforce" "nohash"
-=======
-fn_query_gsquery() {
-	if [ ! -f "${functionsdir}/query_gsquery.py" ]; then
-		fn_fetch_file_github "lgsm/functions" "query_gsquery.py" "${functionsdir}" "chmodx" "norun" "noforce" "nohash"
->>>>>>> develop:lgsm/functions/command_monitor.sh
 	fi
 	"${modulesdir}"/query_gsquery.py -a "${queryip}" -p "${queryport}" -e "${querytype}" >/dev/null 2>&1
 	querystatus="$?"