Update build-wheels.yml

Author: banderson84

.github/workflows/build-wheels.yml

@@ -47,8 +47,6 @@ jobs:
       - name: Move submodules lib into the directory root
         run: cp -r src/libmerc/xsimd/include/xsimd/* src/libmerc/xsimd/
 
-=======
->>>>>>> 296e1c6b870b77cd86bc5631a3c7e55c25dd0298
       - name: Build Mercury
         run: ./configure && make && cp -r src/cython/* ./