Skip to content
Commit bf0f2c0a authored by ruiyue's avatar ruiyue
Browse files

Code Moderator resolves the implementation conflict 

Merge branch 'Integration_Rel19_SA5_159_YAML' into 'TS28.312_Rel19_CRXXXX_Add_YAML_definition_for_Intent_capability_exposure'

# Conflicts:
#   OpenAPI/TS28312_IntentNrm.yaml
parents 6d8d4905 54cd189b
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment