Updating hyper-meta-schema

Author: geraintluff

hyper-schema

@@ -70,7 +70,6 @@
             "description": "Instances' URIs must start with this value for this schema to apply to them",
             "type": "string",
             "format": "uri"
-<<<<<<< HEAD
         }
     },
     "definitions": {
@@ -129,54 +128,4 @@
             "href": "{+($ref)}"
         }
     ]
-=======
-        }
-    },
-    "definitions": {
-        "schemaArray": {
-            "type": "array",
-            "items": {"$ref": "#"}
-        },
-        "linkDescription": {
-            "title": "Link Description Object",
-            "type": "object",
-            "required": ["href", "rel"],
-            "properties": {
-                "href": {
-                    "description": "a URI template, as defined by RFC 6570, with the addition of the $, ( and ) characters for pre-processing",
-                    "type": "string"
-                },
-                "rel": {
-                    "description": "relation to the target resource of the link",
-                    "type": "string"
-                },
-                "title": {
-                    "description": "a title for the link",
-                    "type": "string"
-                },
-                "targetSchema": {
-                    "description": "JSON Schema describing the link target",
-                    "$ref": "#"
-                },
-                "mediaType": {
-                    "description": "media type (as defined by RFC 2046) describing the link target",
-                    "type": "string"
-                },
-                "method": {
-                    "description": "method for requesting the target of the link (e.g. for HTTP this might be \"GET\" or \"DELETE\")",
-                    "type": "string"
-                },
-                "encType": {
-                    "description": "The media type in which to submit data along with the request",
-                    "type": "string",
-                    "default": "application/json"
-                },
-                "schema": {
-                    "description": "Schema describing the data to submit along with the request",
-                    "$ref": "#"
-                }
-            }
-        }
-    }
->>>>>>> 79c1a7afd282f76e50d93e8aeac2ad9943716eec
 }