From b030314c623334ad081fa8832f2d6469f137acc5 Mon Sep 17 00:00:00 2001
From: Sualeh Fatehi <sualeh@hotmail.com>
Date: Wed, 6 Nov 2024 19:35:02 -0500
Subject: [PATCH] Remove merge comments

---
 .github/workflows/codeql-analysis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 6e91cdaa01..d2384b58e3 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -63,9 +63,5 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: java_sarif
-<<<<<<< HEAD
-        path: .results/java.sarif
-=======
         path: ./results/java.sarif
->>>>>>> 3f7f14107 (Fix upload path)
         retention-days: 5