From 74d87c54a018e9c89e7a6840caf072fc36a7a161 Mon Sep 17 00:00:00 2001
From: marauder2k7 <ctrl-intelligence@live.co.uk>
Date: Tue, 1 Aug 2023 06:43:45 +0100
Subject: [PATCH] Update test-results-linux.yml

---
 .github/workflows/test-results-linux.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/test-results-linux.yml b/.github/workflows/test-results-linux.yml
index c7a5977f6..7f61a8c5f 100644
--- a/.github/workflows/test-results-linux.yml
+++ b/.github/workflows/test-results-linux.yml
@@ -21,15 +21,6 @@ jobs:
                   runos: ubuntu-latest,
                   artifact-name: "torque3dLinuxGCCUnitTest"
                 }
-<<<<<<<< HEAD:.github/workflows/test-results.yml
-              - {
-                  name: "Mac Test Results",
-                  runos: macos-latest,
-                  artifact-name: "torque3dMacOSXCLANGUnitTest"
-                }
-========
->>>>>>>> upstream/development:.github/workflows/test-results-linux.yml
-              
         steps:
             - name: Download Linux Test Report
               uses: dawidd6/action-download-artifact@v2