Commit fc7ea618 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Resolving merge conflict

parents af785d5a 151edaf4
Loading
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@
        "CommsIDToVINRecord" : {
            "type" : "object",
            "properties" : {
                "VIN" : { "$ref" : "ts_103280_2017_07#/$defs/VIN" }
                "VIN" : { "$ref" : "ts_103280_2017_07#/$defs/VIN" },
                "AssociationTime" : { "$ref" : "#/$defs/AssociationTime"}
            },
            "required" : ["VIN"]
        },