Commit fa798be9 authored by ruiyue's avatar ruiyue
Browse files

Code Moderator resolve the implementation conflict issue 

Merge branch 'Integration_Rel20_SA5_166_YAML' into 'R20_TS28561_CRxxxx_NDT_collaboration'

# Conflicts:
#   OpenAPI/TS28561_NdtNrm.yaml
parents c7679974 966f6f94