Commit a69606dc authored by sunse's avatar sunse
Browse files

manual confliction fix for rebase

parents 1e5d9e01 988c66de

OpenAPI/5gcNrm.yaml

+7 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ components: 
      items:

        type: string



<<<<<<< HEAD

    DnnSmfInfoItem:

      type: object

      properties:
@@ -593,6 +594,8 @@ components: 
        ipv6Prefix:

          type: string



=======

>>>>>>> 988c66de086071215dc877dab89b30ca570331a7

    5GCNfConnEcmInfoList:

      type: array

      items:
@@ -621,6 +624,10 @@ components: 
        uPFRef:

          $ref: 'genericNrm.yaml#/components/schemas/Dn'



<<<<<<< HEAD

=======

            

>>>>>>> 988c66de086071215dc877dab89b30ca570331a7

#-------- Definition of concrete IOCs --------------------------------------------



    SubNetwork-Single: