Update linux-ci.yml

Author: TravisEz13

.github/workflows/linux-ci.yml

@@ -51,11 +51,8 @@ jobs:
     # Set job outputs to values from filter step
     outputs:
       source: ${{ steps.filter.outputs.source }}
-<<<<<<< HEAD
-=======
       buildModuleChanged: ${{ steps.filter.outputs.buildModuleChanged }}
       packagingChanged: ${{ steps.filter.outputs.packagingChanged }}
->>>>>>> cdeda2a50 (Add log grouping to build.psm1 for collapsible GitHub Actions logs (#26326))
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -154,7 +151,6 @@ jobs:
     needs:
       - ci_build
       - changes
-<<<<<<< HEAD
     if: ${{ needs.changes.outputs.source == 'true' }}
     runs-on: ubuntu-latest
     steps:
@@ -174,10 +170,6 @@ jobs:
       actions: read
       contents: read
       security-events: write
-=======
-    if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }}
-    uses: ./.github/workflows/xunit-tests.yml
->>>>>>> cdeda2a50 (Add log grouping to build.psm1 for collapsible GitHub Actions logs (#26326))
     with:
       runner_os: ubuntu-latest