From 8a647ed5c1adc924c0d4359e2dfbc1f26e0a48e8 Mon Sep 17 00:00:00 2001
From: Sherwin Price <Price.Sherwin@sysmex-inostics.com>
Date: Tue, 21 Nov 2023 07:44:53 -0500
Subject: [PATCH] add sample material column and rewrite inosticID column

---
 qubittool/rowmodel.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/qubittool/rowmodel.py b/qubittool/rowmodel.py
index 7447ea0..7309151 100644
--- 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