-
Celine Mercier authored
git@git.metabarcoding.org:obitools/obitools3.git into Eric_new_Python_API Conflicts: python/obitools3/obidms/_obidms.pxd python/obitools3/obidms/_obidms.pyx python/obitools3/obidms/_obidmscolumn_bool.pyx python/obitools3/obidms/_obidmscolumn_str.pyx python/obitools3/obidms/_obiseq.pxd python/obitools3/obidms/_obiseq.pyx python/obitools3/obidms/_obitaxo.pxd python/obitools3/obidms/_obitaxo.pyx python/obitools3/obidms/_obiview.pxd python/obitools3/obidms/_obiview.pyx python/obitools3/obidms/_obiview_nuc_seq.pxd python/obitools3/obidms/_obiview_nuc_seq.pyx python/obitools3/obidms/_obiview_nuc_seq_qual.pxd python/obitools3/obidms/_obiview_nuc_seq_qual.pyx python/obitools3/obidms/capi/obialign.pxd python/obitools3/obidms/capi/obidmscolumn.pxd python/obitools3/obidms/capi/obitaxonomy.pxd python/obitools3/obidms/capi/obiview.pxd
431c1c8c