Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

[smartthings-infrastructure.git] / ModelCheck.py

diff --git a/ModelCheck.py b/ModelCheck.py
index 661018e1749353637721c704a8f2fdaea189c586..e3c6ff910e710a9975f5a8065d51ce8042728aee 100644 (file)
--- a/ModelCheck.py
+++ b/ModelCheck.py
@@ -117,8 +117,11 @@ writeLogList.close()
 
 
 
+<<<<<<< HEAD
+=======
 
 
 
 
 
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c