confilcts

93cafadb · Spiros Koulouzis · 640dca7f · 93cafadb · 93cafadb
Commit 93cafadb authored Dec 06, 2019 by Spiros Koulouzis
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 547 additions and 283 deletions

CONF-3.0.0-swagger.yaml openAPI/CONF-3.0.0-swagger.yaml +546 -282

Provisioner.yml openAPI/Provisioner.yml +1 -1

No files found.
--- a/openAPI/CONF-3.0.0-swagger.yaml
+++ b/openAPI/CONF-3.0.0-swagger.yaml
--- a/openAPI/Provisioner.yml
+++ b/openAPI/Provisioner.yml
@@ -8,4 +8,4 @@ Provisioner:
    description:
        type: "string"
    tosca_interface_types:
-        type: "string"
\ No newline at end of file
+        type: "string"