Skip to content

Add print statement to test git merge #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bsardo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add print statement to test git merge #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8f9549
Add print statement to test git merge
bsardo Nov 19, 2021
ff3a247
Merge branch 'master' of github.com:bsardo/prebid-server into merge-test
bsardo Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions exchange/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ func prepareSource(req *openrtb2.BidRequest, bidder string, sChainsByBidder map[
} else {
sourceCopy := *req.Source
req.Source = &sourceCopy
fmt.Println("This is a merge test")
}
schain := openrtb_ext.ExtRequestPrebidSChain{
SChain: *selectedSChain,
Expand All @@ -350,6 +351,7 @@ func prepareSource(req *openrtb2.BidRequest, bidder string, sChainsByBidder map[
if err == nil {
req.Source.Ext = sourceExt
}

}

// extractBuyerUIDs parses the values from user.ext.prebid.buyeruids, and then deletes those values from the ext.
Expand Down