Fixes conflicts after merge

Samo Penic

2016-12-06 1d1f5861495fc6e07d8a683ca8dbbaa43936b212

 python/myTestConfig.py

@@ -1,7 +1,7 @@
#!/usr/bin/python3
from trisurf import tsmgr
from trisurf import trisurf

from trisurf import statistics


print("Running trisurf version "+ tsmgr.getTrisurfVersion())
@@ -30,4 +30,4 @@
Runs=[run1,run2]+pRun
#start manager with configured runs
tsmgr.start(Runs)

#statistics.combine([run1,run2])