Merge branch 'feature/IntegrityCheckField' into develop

# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.NC/SiemensToolTableAdapter.cs
This commit is contained in:
Lucio Maranta
2019-12-11 15:06:11 +01:00
10 changed files with 42 additions and 22 deletions
@@ -23,6 +23,7 @@ namespace Step.Model.ConfigModels
public bool SelfAdaptivePathOpt { get; set; }
public bool DynamicCompensationOpt { get; set; }
public bool BallufOpt { get; set; }
public bool IntegrityCheckOpt { get; set; }
public CooligTranslations CooligsTranslations { get; set; }