Commit effeccca authored by bradburyr's avatar bradburyr
Browse files

Removed spurious merge conflict line.

parent 08b2c245

TS26510_Maf_Provisioning_ContentHosting.yaml

+0 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ paths: 
      security:

        - OAuth2:

          - content-hosting-configuration_purge-cache

>>>>>>> ede732b (Aligned Maf Provisioning (M1) security scheme to OAuth2.)

      requestBody:

        description: 'The regular expression pattern for resources to purge from the cache'

        required: true