I have no idea how the GitHub changes code got in to my source code
@@ -3,11 +3,8 @@
# Server Management Script
# Author: Daniel Gibbs
# Website: http://danielgibbs.co.uk
-<<<<<<< HEAD
# Version: 251214
-=======
# Version: 240114
->>>>>>> Major update 240114
#### Variables ####