Correct lingering merge issue.
@@ -88,8 +88,7 @@ jobs:
if: steps.cache-hdf5.outputs.cache-hit != 'true'
run: |
set -x
-<<<<<<< HEAD
-=======
+
wget https://support.hdfgroup.org/ftp/HDF/releases/HDF4.2.15/src/hdf-4.2.15.tar.bz2
tar -jxf hdf-4.2.15.tar.bz2
pushd hdf-4.2.15
@@ -97,7 +96,7 @@ jobs:
make -j
make install -j
popd
->>>>>>> a03bb5e60165b11be11f8c1e8e492a274a742011
+
wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-$(echo ${{ matrix.hdf5 }} | cut -d. -f 1,2)/hdf5-${{ matrix.hdf5 }}/src/hdf5-${{ matrix.hdf5 }}.tar.bz2
tar -jxf hdf5-${{ matrix.hdf5 }}.tar.bz2
pushd hdf5-${{ matrix.hdf5 }}
