fix: downgrade urllib3 version to support openSSL in workflow

zerodha · Feb 7, 2024 · 9f7d42d · 9f7d42d
1 parent be7e02e
commit 9f7d42d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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: |