Resolving Merge Issue

PubMatic-OpenWrap · Apr 13, 2021 · 4a88c61 · 4a88c61
1 parent c01ab29
commit 4a88c61
Show file tree

Hide file tree

Showing 4 changed files with 115 additions and 355 deletions.
diff --git a/exchange/adapter_builders.go b/exchange/adapter_builders.go
@@ -89,6 +89,7 @@ import (
 	"github.com/PubMatic-OpenWrap/prebid-server/adapters/ucfunnel"
 	"github.com/PubMatic-OpenWrap/prebid-server/adapters/unruly"
 	"github.com/PubMatic-OpenWrap/prebid-server/adapters/valueimpression"
+	"github.com/PubMatic-OpenWrap/prebid-server/adapters/vastbidder"
 	"github.com/PubMatic-OpenWrap/prebid-server/adapters/verizonmedia"
 	"github.com/PubMatic-OpenWrap/prebid-server/adapters/visx"
 	"github.com/PubMatic-OpenWrap/prebid-server/adapters/vrtcal"
@@ -192,6 +193,7 @@ func newAdapterBuilders() map[openrtb_ext.BidderName]adapters.Builder {
 		openrtb_ext.BidderTripleliftNative: triplelift_native.Builder,
 		openrtb_ext.BidderUcfunnel:         ucfunnel.Builder,
 		openrtb_ext.BidderUnruly:           unruly.Builder,
+		openrtb_ext.BidderVASTBidder:       vastbidder.Builder,
 		openrtb_ext.BidderValueImpression:  valueimpression.Builder,
 		openrtb_ext.BidderVerizonMedia:     verizonmedia.Builder,
 		openrtb_ext.BidderVisx:             visx.Builder,