Skip to content
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.

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

collossus.md change #1484

Merged
merged 3 commits into from
Sep 16, 2019
Merged

collossus.md change #1484

merged 3 commits into from
Sep 16, 2019

Conversation

HuddledMasses
Copy link
Contributor

add media types variable to te docs section

@jsnellbaker
Copy link
Contributor

@HuddledMasses It looks like there are conflicts in this PR. Can you take a look and resolve?

@bretg
Copy link
Contributor

bretg commented Sep 16, 2019

I fixed the conflicts. Merging.

@bretg bretg merged commit d031f07 into prebid:master Sep 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants