X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=Runner.py;h=d72844dbe2d2be08adace65a80fcfab232280238;hp=5d3e101a08b25ee5537ad8ab89c4a9a387ac5c9d;hb=86c861ff59c870277d034de77d6cef2a4c6f5aa4;hpb=d00fd74ad7e497d6849c284c6ba69db2d3ec8e65

diff --git a/Runner.py b/Runner.py
index 5d3e101..d72844d 100644
--- 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)