add sample material column and rewrite inosticID column

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