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/setup.cfg
+++ b/setup.cfg
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 [metadata]
 name = qubittool
 version = 0.1.0
@@ -13,20 +12,4 @@ install_requires =
    pandas

 [options.package_data]
-=======
-[metadata]
-name = qubittool
-version = 0.1.0
-
-[options]
-packages = find:
-zip_safe = True
-include_package_data = True
-install_requires = 
-    PySimpleGUI >= 4.60
-    openpyxl >= 3.1
-    pandas
-
-[options.package_data]
->>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
 * = README.md