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

Address the implementation conflict 

Merge branch 'Integration_Rel18_SA5_151_YAML' into 'TS28.312_Rel-18_CR0136_Adding_5GC_expectation_in_Intent_IOC_stage_3'

# Conflicts:
#   OpenAPI/TS28312_IntentNrm.yaml
parents 80155b02 a700cf88
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