Update action.yml

.github/actions/install-main-dependencies/action.yml

@@ -100,61 +100,7 @@ runs:
           source "$CONDA/etc/profile.d/conda.sh"
           conda activate scsenv
         fi
-<<<<<<< HEAD
-        if [ "${{ inputs.os }}" == "ubuntu-latest" ]; then
-          export DISABLE_CONAN=1
-          sudo apt-get -y install nlohmann-json3-dev
-          sudo apt-get -y install libspdlog-dev
-          sudo apt-get -y install libmuparserx-dev
-        fi
-        git clone --depth 1 --branch main https://github.com/Qiskit/qiskit-aer.git /tmp/qiskit-aer
-        BASE_DIR=aer-cache
-        build_from_main=true
-        cache_hit=${{ steps.aer-cache.outputs.cache-hit }}
-        echo "cache hit: ${cache_hit}"
-        if [ "$cache_hit" == "true" ]; then
-          pip_result=0
-          pushd "${BASE_DIR}"
-          python -m pip install *.whl && pip_result=$? || pip_result=$?
-          popd
-          if [ $pip_result == 0 ]; then
-            echo 'Verifying cached Aer with tools/verify_wheels.py ...'
-            verify_result=0
-            pushd /tmp/qiskit-aer
-            python tools/verify_wheels.py && verify_result=$? || verify_result=$?
-            popd
-            if [ $verify_result == 0 ]; then
-              echo 'Cached Aer passed verification.'
-              build_from_main=false
-            else
-              echo 'Cached Aer failed verification.'
-              pip uninstall -y qiskit-aer
-            fi
-          fi
-        else
-          mkdir -p ${BASE_DIR}
-        fi
-        if [ "$build_from_main" == "true" ]; then
-          echo 'Create wheel file from main'
-          pip install -U wheel
-          pushd /tmp/qiskit-aer
-          if [ "${{ inputs.os }}" == "windows-2019" ]; then
-            python setup.py bdist_wheel -- -G 'Visual Studio 16 2019'
-          elif  [ "${{ inputs.os }}" == "macos-latest" ]; then
-            pip install -U -c constraints.txt -r requirements-dev.txt
-            python setup.py bdist_wheel --plat-name macosx-10.16-x86_64
-          else
-            python setup.py bdist_wheel
-          fi
-          popd
-          cp -rf /tmp/qiskit-aer/dist/*.whl "${BASE_DIR}"
-          pushd "${BASE_DIR}"
-          python -m pip install *.whl
-          popd
-        fi
-=======
         pip install -U qiskit-aer
->>>>>>> 88084d7 (Terra main vs stable install switch (#265))
       shell: bash
     - name: Install Optimization from Main
       run: |