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

Code Moderator resolves the conflict information manually 

Merge branch 'Integration_Rel19_SA5_159_YAML' into 'Rel19_CR0255_TS_28.312_Enhance_the_use_case_and_solution_to_support_radio_network_traffic_assurance_for_scheduled_events_scenario'

# Conflicts:
#   OpenAPI/TS28312_IntentExpectations.yaml
parents b6526cea 481be1ac
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