From 9f7d42dc1d167cfd87064eb70482720e3bdf2dc9 Mon Sep 17 00:00:00 2001
From: Rakesh R <ranjan01995@gmail.com>
Date: Wed, 7 Feb 2024 15:07:05 +0530
Subject: [PATCH] fix: downgrade urllib3 version to support openSSL in workflow

---
 .github/workflows/test-conda.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/test-conda.yml b/.github/workflows/test-conda.yml
index b011076f..9d500ad6 100644
--- a/.github/workflows/test-conda.yml
+++ b/.github/workflows/test-conda.yml
@@ -24,10 +24,6 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-<<<<<<< HEAD
-=======
-
->>>>>>> ef49655... fix: downgrade urllib3 version to support openSSL in workflow
       - name: Install dependencies
         shell: bash -l {0}
         run: |