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

[smartthings-infrastructure.git] / Extractor / ExtractorScript.py

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 5bd867aa2ad37cce06b06b4f020de1428144f8ad..27abbc1044d509823a7ce91f2316f8aa99ae41f6 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -419,8 +419,12 @@ def CheckIfOnlyTouchEvents():
                        onlyTouchEvents = False
        if onlyTouchEvents is True and app1Subscribe is True and app2Subscribe is True:
                raise Exception("\n\nDirect-Direct Interaction detected: we are skipping this pair...\n\n")
+<<<<<<< HEAD
 
 
+=======
+               
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c
 #Extract objects to call functions from App1
 F1 = open("Extractor/App1/App1.groovy", "r")
 extractedFunctionsApp1 = open("Extractor/App1/extractedFunctionsApp1.groovy", "w+")
@@ -479,5 +483,10 @@ extractorFile.close()
 Extractor.close()
 F2.close()
 os.system("groovy -classpath lib/jpf.jar Extractor/extractorFile.groovy")
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c