add sample material column and rewrite inosticID column

2023-11-21 07:44:53 -05:00
parent 5fa13e267f
commit 8a647ed5c1
1 changed files with 0 additions and 4 deletions
--- a/qubittool/rowmodel.py
+++ b/qubittool/rowmodel.py
@@ -40,7 +40,6 @@ class RowModel:

    def get_customerid(self):
        return self.customerid
-<<<<<<< HEAD

    def set_materialid(self, matrlid:str):
        self.materialid = matrlid
@@ -48,9 +47,6 @@ class RowModel:
    def get_materialid(self):
        return self.materialid

-=======
-    
->>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
    def set_qubitassay(self, assay:str):
        self.qubitassay = assay