...

2025-04-20 06:34:31 +02:00
parent 838e966dc9
commit 189971509a
23 changed files with 2913 additions and 13 deletions
--- a/herodb/src/models/biz/product.rs
+++ b/herodb/src/models/biz/product.rs
@@ -117,13 +117,8 @@ impl ProductComponentBuilder {
    }
 }

-<<<<<<< HEAD
 /// Product represents a product or service offered in the system
 #[derive(Debug, Clone, Serialize, Deserialize)]
-=======
-/// Product represents a product or service offered by the Freezone
-#[derive(Debug, Clone, Serialize, Deserialize, CustomType)]
->>>>>>> builders_in_script
 pub struct Product {
    pub id: i64,
    pub name: String,