Remove merge conflict header

MikeRalphson · web-flow · commit c7c343c0229e · 2016-09-30T13:49:55.000+01:00
diff --git a/versions/3.0.md b/versions/3.0.md
@@ -1302,7 +1302,6 @@ Field Pattern | Type | Description
 
 Example representation for application/json media type of a Pet data type:
 
-<<<<<<< HEAD
 ```json
 [
   {

Original file line number	Diff line number	Diff line change
`@@ -1302,7 +1302,6 @@ Field Pattern \| Type \| Description`
`1302`	`1302`
`1303`	`1303`	`Example representation for application/json media type of a Pet data type:`
`1304`	`1304`
`1305`		`-<<<<<<< HEAD`
`1306`	`1305`	```json
`1307`	`1306`	`[`
`1308`	`1307`	`{`