kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-04-03 10:29:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update elementdata.h

Browse Source
This commit is contained in:
Laurent Trinques
2026-03-31 16:23:05 +02:00
committed by GitHub
parent 4834d41432
commit c220d84fcb
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sources/properties/elementdata.h
View File

@@ -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;