Commit e3caf4ec authored by sunse's avatar sunse
Browse files

manual fix of confliction

parent a69606dc

OpenAPI/5gcNrm.yaml

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

        type: string



<<<<<<< HEAD

    DnnSmfInfoItem:

      type: object

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

          type: string



=======

>>>>>>> 988c66de086071215dc877dab89b30ca570331a7

    5GCNfConnEcmInfoList:

      type: array

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

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



<<<<<<< HEAD

=======

            

>>>>>>> 988c66de086071215dc877dab89b30ca570331a7

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



    SubNetwork-Single: