From bd8c88e8ac21ef1b7d1778048795457ea853239d Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Sat, 31 May 2025 07:52:19 +1000
Subject: [PATCH] Update Go tests workflow

---
 .github/workflows/pr-master.yml | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/.github/workflows/pr-master.yml b/.github/workflows/pr-master.yml
index 532bcec02..00c0f9103 100644
--- a/.github/workflows/pr-master.yml
+++ b/.github/workflows/pr-master.yml
@@ -29,32 +29,6 @@ jobs:
         run: |
           echo "::warning::Feature branch does not contain any changes to the website."
 
-<<<<<<<< HEAD:.github/workflows/pr-v2.yml
-#  lint_go:
-#    name: Run Go Linters
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout code
-#        uses: actions/checkout@v4
-#
-#      - name: Setup Go
-#        uses: actions/setup-go@v4
-#        with:
-#          go-version: "1.21"
-#
-#      - name: Update go modules
-#        working-directory: ./v2
-#        run: go mod tidy
-#
-#      - name: Run Linter
-#        uses: golangci/golangci-lint-action@v3
-#        with:
-#          version: v1.54
-#          working-directory: ./v2
-#          args: --timeout=10m0s --config ./.golangci.yml
-
-========
->>>>>>>> 471ea9350 (Update workflows):.github/workflows/pr-master.yml
   test_go:
     name: Run Go Tests
     runs-on: ${{ matrix.os }}
@@ -101,7 +75,7 @@ jobs:
         if: matrix.os == 'ubuntu-24.04'
         working-directory: ./v2
         run: go test -v -tags webkit2_41 ./...
-    
+
   # This job will run instead of test_go for the update-sponsors branch
   skip_tests:
     name: Skip Tests (Sponsor Update)