Infrastructure that works for all the locks' group!

[smartthings-infrastructure.git] / ModelCheck.py

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