add sample material column and rewrite inosticID column

2023-11-21 07:36:56 -05:00
parent 1b0e44a302
commit 3d2f3fdf2f
5 changed files with 58 additions and 0 deletions
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 [build-system]
 requires = ["setuptools"]
+=======
+[build-system]
+requires = ["setuptools"]
+>>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
 build-backend = "setuptools.build_meta"