Update to PR #747 to resolve conflicts with Master

website/static/schemas/next/interaction.schema.json

@@ -0,0 +1,37 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://fdc3.finos.org/schemas/next/interaction.schema.json",
+  "type": "object",
+  "title": "Interaction",
+  "allOf": [{ "$ref": "context.schema.json#" }],
+  "properties": {
+    "type": { "const": "fdc3.interaction" },
+    "participants": {
+      "$ref": "contactList.schema.json#"
+    },
+    "timeRange": {
+      "$ref": "timerange.schema.json#"
+    },
+    "interactionType": {
+      "anyOf": [
+        {
+          "type": "string",
+          "enum": ["Instant Message", "Email", "Call", "Meeting"]
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "description": {
+      "type": "string"
+    },
+    "initiator": {
+       "$ref": "contact.schema.json#"
+    },
+     "origin": {
+      "type": "string"
+    }
+  },
+  "required": ["contacts", "timeRange", "interactionType", "description"]
+}