From 8a6646bd7c162ac33317e7538744510fde7f958c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@dhbw.de>
Date: Wed, 20 Mar 2019 13:00:08 +0100
Subject: [PATCH] 	modified:  
 ../../../main/java/de/dhbwstuttgart/core/JavaTXCompiler.java

---
 .../java/de/dhbwstuttgart/core/JavaTXCompiler.java    | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java b/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
index bbe8c257..8c088804 100644
--- a/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
+++ b/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
@@ -291,21 +291,14 @@ public class JavaTXCompiler {
 
         final ConstraintSet<Pair> cons = getConstraints();
         Set<Set<UnifyPair>> results = new HashSet<>();
-<<<<<<< HEAD
         UnifyResultModel urm = null;
-        try {
-			Writer logFile = new FileWriter(new File(System.getProperty("user.dir")+"/src/test/java/logFiles/"+"log_"+sourceFiles.keySet().iterator().next().getName()));
-			
-=======
-        UnifyResultModel urm = new UnifyResultModel();
-        urm.addUnifyResultListener(resultListener);
+        //urm.addUnifyResultListener(resultListener);
         try {
         	logFile = logFile == null ? new FileWriter(new File("log_"+sourceFiles.keySet().iterator().next().getName())) : logFile;
-
->>>>>>> 7cb2eed36edfe2d9f3ec4ce5c0ca40702dcff7f2
 			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses,logFile);
 			System.out.println(finiteClosure);
 			urm = new UnifyResultModel(cons, finiteClosure);
+			urm.addUnifyResultListener(resultListener);
 			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(cons);
 			
 			Function<UnifyPair, UnifyPair> distributeInnerVars =