Infrastructure that works for all the locks' group!

[smartthings-infrastructure.git] / Runner.py

diff --git a/Runner.py b/Runner.py
index 5d3e101a08b25ee5537ad8ab89c4a9a387ac5c9d..d72844dbe2d2be08adace65a80fcfab232280238 100644 (file)
--- a/Runner.py
+++ b/Runner.py
@@ -303,13 +303,8 @@ Out.write("if (installOrder) {\n")
 Out.write("\tapp1.installed()\n")
 Out.write("\tapp2.installed()\n")
 Out.write("} else {\n")
-<<<<<<< HEAD
 Out.write("\tapp2.installed()\n")
 Out.write("\tapp1.installed()\n")
-=======
-Out.write("\tapp1.installed()\n")
-Out.write("\tapp2.installed()\n")
->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c
 Out.write("}\n\n")
 for line in eventSimulator:
        Out.write(line)