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

Address implementation conflict 

Merge branch 'Integration_Rel18_SA5_151_YAML' into 'TS28.541_Rel-18_CR01029_Add_YAML_solution_set_for_NRM_for_operator_specific_QoS_model_for_RAN_sharing'

# Conflicts:
#   OpenAPI/TS28541_NrNrm.yaml
parents 8bde96ed cc722a61
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 to comment