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/qubittool/rowmodel.py
+++ b/qubittool/rowmodel.py
@@ -4,10 +4,7 @@ class RowModel:
        self.coordinate = coordinate
        self.accessionid = accessionid
        self.customerid = None
-<<<<<<< HEAD
        self.materialid = None
-=======
->>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
        self.plasmavolml = float(0.0)
        self.qubitrunid = None
        self.qubitassay = None