From e25f2e0d28b8fed07eb5552fbfa3c607e9ec2b39 Mon Sep 17 00:00:00 2001
From: clr2of8 <clr2of8@gmail.com>
Date: Wed, 27 Mar 2024 21:02:03 -0500
Subject: [PATCH] merge from master

---
 Public/Invoke-AtomicRunner.ps1 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Public/Invoke-AtomicRunner.ps1 b/Public/Invoke-AtomicRunner.ps1
index c51bc14..076bd23 100755
--- a/Public/Invoke-AtomicRunner.ps1
+++ b/Public/Invoke-AtomicRunner.ps1
@@ -227,12 +227,8 @@ function Invoke-AtomicRunner {
                 if ($scheduledTaskCleanup) {
                     # Cleanup after running test
                     Write-Host -Fore cyan "Sleeping for $SleepTillCleanup seconds before cleaning up for $($tr.Technique) $($tr.auto_generated_guid) "; Start-Sleep -Seconds $SleepTillCleanup
-<<<<<<< HEAD
                     $htvars.Add("Cleanup")
                     Invoke-AtomicTestFromScheduleRow $tr
-=======
-                    Invoke-AtomicTestFromScheduleRow $tr $true
->>>>>>> f43d87e7447bcc8b180d7f0898d4a92fba4da33f
                 }
                 else {
                     # run the atomic test and exit