Remove merge comments

sualeh · sualeh · commit b030314c6233 · 2024-11-06T19:35:02.000-05:00
diff --git 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
