From 5df8dfe68dd6aa4a74bc1d8abbf03a6143a77ac4 Mon Sep 17 00:00:00 2001
From: mazzol_a <mazzol_a@pc17378.psi.ch>
Date: Fri, 2 May 2025 16:57:58 +0200
Subject: [PATCH] some tests dont run

---
 tests/scripts/test_simulators.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/scripts/test_simulators.py b/tests/scripts/test_simulators.py
index 9492b83bc..4c13fee9d 100644
--- a/tests/scripts/test_simulators.py
+++ b/tests/scripts/test_simulators.py
@@ -199,15 +199,9 @@ with open(fname, 'w') as fp:
     Log(Fore.BLUE, 'General tests (results: ' + file_results + ')')
 
     try:
-<<<<<<< HEAD
-        killAllStaleProcesses(fp)
+        cleanup(fp)
         startGeneralTests(fp, file_results)
         
-=======
-        startGeneralTests(fp, file_results)
-        cleanup(fp)
-
->>>>>>> developer
         testError = False
         for server in servers:
             try: