# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

Merge branch 'RDM-2025-0010-Correcting_action_and_attribute_name_for_raingauge_MC_Adding_short_nam' into R5

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

Original contribution:RDM-2024-0048-Adding_short_names_for_slcReportInfo_MC

See merge request !19

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

Resolved merge conflicts

Original contribution: RDM-2024-0047-Adding_short_names_for_slcParameterSetting_MC

See merge request !18