Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production

Browse Source

# Conflicts:
#	Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache

...

This commit is contained in:

Thomas Wiedebusch

2025-04-10 14:46:07 +02:00

parent 62802caf31 92de25455a

commit 8021a3aa8d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available