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

Code Moderator address the implementation conflict issue 

Merge branch 'Integration_Rel18_SA5_152_YAML' into 'TS28.312_Rel18_CR_0177_add_attributes_of_intent_preemption'

# Conflicts:
#   OpenAPI/TS28312_IntentNrm.yaml
parents aac7a6e3 119809e8
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