Fix remaining merge conflicts

Author: acpaquette

recipe/meta.yaml

@@ -104,19 +104,12 @@ requirements:
    - pytest
    - rclone
    - qhull
-<<<<<<< HEAD
    - qt6-main >=6,<7
    - qt6-multimedia
    - qwt =6.3.0
    - spiceypy >=6,<7
    - spiceql >=1.2.4,<2
    - sqlite >=3.46.0,<4
-=======
-   - qt-main >=5.15,<5.16
-   - qwt <6.3.0
-   - spiceql =1.2.0=*_1
-   - sqlite >=3.46.0,<3.47
->>>>>>> 57c1382b1 (Update meta.yaml)
    - suitesparse <7.7.0
    - superlu
    - swig
@@ -139,14 +132,8 @@ requirements:
   - blas
   - {{ pin_compatible('bullet', max_pin='x.x') }}
   - bz2file
-<<<<<<< HEAD
   - csm
   - cspice
-=======
-  - usgs-astrogeology::csm                        # [osx and arm64]
-  - csm                                           # [not (osx and arm64)]
-  - cspice=67=*_11
->>>>>>> 57c1382b1 (Update meta.yaml)
   - curl
   - eigen
   - {{ pin_compatible('embree', min_pin='x.x', max_pin='x.x') }}