From c220d84fcb011430c539825eda88ae9e407b3125 Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Tue, 31 Mar 2026 16:23:05 +0200 Subject: [PATCH] Update elementdata.h --- sources/properties/elementdata.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sources/properties/elementdata.h b/sources/properties/elementdata.h index a0854eb2f..1180e58d2 100644 --- a/sources/properties/elementdata.h +++ b/sources/properties/elementdata.h @@ -134,10 +134,9 @@ class ElementData : public PropertiesInterface ElementData::Type m_type = ElementData::Simple; ElementData::MasterType m_master_type = ElementData::Coil; -<<<<<<< master + int m_max_slaves{-1}; -======= ->>>>>>> master + ElementData::SlaveType m_slave_type = ElementData::SSimple; ElementData::SlaveState m_slave_state = ElementData::NO;