From 1d1f5861495fc6e07d8a683ca8dbbaa43936b212 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:43:15 +0000
Subject: [PATCH] Fixes conflicts after merge

---
 python/myTestConfig.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/myTestConfig.py b/python/myTestConfig.py
index 1f3b547..aa307f4 100755
--- a/python/myTestConfig.py
+++ b/python/myTestConfig.py
@@ -29,5 +29,5 @@
 #obligatory final configuration step: combine all runs
 Runs=[run1,run2]+pRun
 #start manager with configured runs
-#tsmgr.start(Runs)
-statistics.combine([run1,run2])
+tsmgr.start(Runs)
+#statistics.combine([run1,run2])

--
Gitblit v1.9.3