Merge pull request #61 from jpmckinney

Author: MarinaNitze

schema.md

@@ -308,11 +308,16 @@ Field       | title
 **Cardinality** | (0,n)
 **Required** | No
 **Accepted Values** | See Usage Notes
+<<<<<<< HEAD
 **Usage Notes** | Distribution is a concatenation, as appropriate, of the following elements: download url, format, endpoint, language, size.  An example of this this model is:  
 
     "distribution": [`{"accessURL": "http://data.mcc.gov/example_resource/data.json", "format":"JSON", "size":"22MB"}`,`{"accessURL":"http://data.mcc.gov/example_/data.xml", "format":"XML", "size":"24MB"}`]  
 
 **Example** | -
+=======
+**Usage Notes** | Distribution is a concatenation, as appropriate, of the following elements: download url, format, endpoint, language, size.
+**Example** | `"distribution": [{"accessURL": "http://data.mcc.gov/example_resource/data.json", "format":"JSON", "size":"22mb"},{"accessURL":"http://data.mcc.gov/example_/data.xml", "format":"XML", "size":"24mb"}]`
+>>>>>>> 91a53c3dd5bad021798ab416ab5e99bc72ee56eb
 
 {.table .table-striped}
 **Field** | **size**