Fix Merge Conflict (prebid#1714)

SyntaxNode · dtbarne · commit 041ef103067c · 2021-05-11T22:58:07.000Z
diff --git a/adapters/pangle/pangle.go b/adapters/pangle/pangle.go
@@ -80,7 +80,7 @@ func (a *adapter) MakeRequests(request *openrtb.BidRequest, requestInfo *adapter
 		}
 		// detect and fill adtype
 		if adType := getAdType(imp, &impExt); adType == -1 {
-			errs = append(errs, adapters.BadInput("not a supported adtype"))
+			errs = append(errs, &errortypes.BadInput{Message: "not a supported adtype"})
 			continue
 		} else {
 			impExt.AdType = adType

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func (a adapter) MakeRequests(request openrtb.BidRequest, requestInfo *adapter`
`80`	`80`	`}`
`81`	`81`	`// detect and fill adtype`
`82`	`82`	`if adType := getAdType(imp, &impExt); adType == -1 {`
`83`		`- errs = append(errs, adapters.BadInput("not a supported adtype"))`
	`83`	`+ errs = append(errs, &errortypes.BadInput{Message: "not a supported adtype"})`
`84`	`84`	`continue`
`85`	`85`	`} else {`
`86`	`86`	`impExt.AdType = adType`