Merging conflicts.

diff --git a/GlobalVariables/GlobalVariablesEachApp.groovy b/GlobalVariables/GlobalVariablesEachApp.groovy
deleted file mode 100644 (file)
index ae8b936..0000000
--- a/GlobalVariables/GlobalVariablesEachApp.groovy
+++ /dev/null
@@ -1,16 +0,0 @@
-//Global variable for state[mode]
-def state = [home:[],away:[],night:[]]
-//Create a global logger object for methods
-def log = new Logger()
-//Create a global variable for Functions in Subscribe method
-def functionList = []
-//Create a global variable for Objects in Subscribe method
-def objectList = []
-//Create a global variable for Events in Subscribe method
-def eventList = []
-//Create a global variable for settings
-def settings
-//Zip code
-def zipCode = 92617
-//atomicState variable
-def atomicState = [version: "1.01"]