From: rtrimana <rtrimana@uci.edu>
Date: Tue, 6 Aug 2019 21:52:02 +0000 (-0700)
Subject: Merging conflicts.
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=commitdiff_plain;h=bf32597a60d4f1ecf669bc4588552723e9a386ae

Merging conflicts.
---

bf32597a60d4f1ecf669bc4588552723e9a386ae
diff --cc GlobalVariables/GlobalVariablesEachApp.groovy
index ae8b936,ba78f98..0000000
deleted file mode 100644,100644
--- a/GlobalVariables/GlobalVariablesEachApp.groovy
+++ /dev/null
@@@ -1,16 -1,16 +1,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 = []
 -def functionList = new ArrayList(20)
--//Create a global variable for Objects in Subscribe method
- def objectList = []
 -def objectList = new ArrayList(20)
--//Create a global variable for Events in Subscribe method
- def eventList = []
 -def eventList = new ArrayList(20)
--//Create a global variable for settings
--def settings
--//Zip code
--def zipCode = 92617
--//atomicState variable
--def atomicState = [version: "1.01"]