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

Add CNN to media coverage #781

Merged
merged 3 commits into from
Dec 19, 2017
Merged

Add CNN to media coverage #781

merged 3 commits into from
Dec 19, 2017

Conversation

GoFroggyRun
Copy link
Contributor

Per the post here, this PR adds CNN to media coverage.

@GoFroggyRun
Copy link
Contributor Author

@hdoupe can we have this PR included in the new update?

@hdoupe
Copy link
Collaborator

hdoupe commented Dec 19, 2017

@GoFroggyRun are the commits fix render issue, fix wrong title for each prints, and fix csv file name issue related to adding the CNN logo?

EDIT: Ah, I see these are from PR #780

@GoFroggyRun
Copy link
Contributor Author

@hdoupe that right. For some reason, those commits in #780 got carried over here. I'll take care of them.

@hdoupe
Copy link
Collaborator

hdoupe commented Dec 19, 2017

@GoFroggyRun I merged #780. I'm not sure why the commits from #780 are still shown in #781. GitHub still shows 6 files changed and the diff seems to show the diff with the master branch before #780 was merged. I'm not sure what the problem is. Do you have any ideas? I just want to make sure that by merging this we aren't writing over something changed in #780.

@GoFroggyRun
Copy link
Contributor Author

@hdoupe yeah. Probably because I didn't update my master after your merge I guess. Now git only shows two file changes. We should be good.

@hdoupe
Copy link
Collaborator

hdoupe commented Dec 19, 2017

Cool, thanks @GoFroggyRun

@hdoupe hdoupe merged commit b6aaed9 into ospc-org:master Dec 19, 2017
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.

2 participants