From 0de7aca26f9519368a205d8bda05267c5eb31206 Mon Sep 17 00:00:00 2001
From: akashrathod28 <akash.rathod@hyland.com>
Date: Tue, 9 Dec 2025 08:57:24 +0100
Subject: [PATCH] [ACS-10838] update branch

---
 .github/workflows/pull-request.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 10280fe08..7364389d9 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -218,20 +218,6 @@ jobs:
             echo "⚠️ Local ACS deployment failed - falling back to adwe2e environment"
           fi
 
-<<<<<<< HEAD
-=======
-      - name: Log environment configuration
-        shell: bash
-        run: |
-          echo "=========================================="
-          echo "E2E Test Environment Configuration"
-          echo "=========================================="
-          echo "Environment: ${{ env.ENVIRONMENT }}"
-          echo "BASE_URL: ${{ env.BASE_URL }}"
-          echo "PLAYWRIGHT_E2E_HOST: ${{ env.PLAYWRIGHT_E2E_HOST }}"
-          echo "=========================================="
-
->>>>>>> 5df9f3b4f77fe23b20eb504dde0b7eac8ac4ba74
       - name: Before e2e
         uses: ./.github/actions/before-e2e