Test merging of develop into Terje-develp-scratch

ITA-Solar / solo-spice-ql

Quicklook software for Solar Orbiter SPICE

MIT License

7 stars 1 forks source link

Closed tfredvik closed 2 years ago

martinwiesmann commented 2 years ago

Here you can also resolve the conflicts and then merge it.

martinwiesmann commented 2 years ago

Will you try to resolve them?