Fix merge error

danielgtaylor · danielgtaylor · commit 79bc0abb277f · 2019-09-28T20:48:25.000-07:00
diff --git a/apisprout.go b/apisprout.go
@@ -211,7 +211,7 @@ func getExample(negotiator *ContentNegotiator, prefer map[string]string, op *ope
 		if err != nil {
 			// If we are using the default with prefer, we can use its status
 			// code:
-			status, err = strconv.Atoi(prefer)
+			status, err = strconv.Atoi(prefer["status"])
 		}
 		if err != nil {
 			// Otherwise, treat default and other named statuses as 200.

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ func getExample(negotiator ContentNegotiator, prefer map[string]string, op ope`
`211`	`211`	`if err != nil {`
`212`	`212`	`// If we are using the default with prefer, we can use its status`
`213`	`213`	`// code:`
`214`		`- status, err = strconv.Atoi(prefer)`
	`214`	`+ status, err = strconv.Atoi(prefer["status"])`
`215`	`215`	`}`
`216`	`216`	`if err != nil {`
`217`	`217`	`// Otherwise, treat default and other named statuses as 200.`