Commit 1f02ff56 authored by sunse's avatar sunse
Browse files

CR0583 manual resolving confliction

parents 90a82ea5 aea62c08
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -1136,6 +1136,9 @@ components:
                      type: array
                      items:
                        $ref: '#/components/schemas/NsacfInfoSnssai'
                    taiList:
                      items:
                        $ref: 'nrNrm.yaml#/components/schemas/TaiList'
        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties: