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

Circleci mac #92

Merged
merged 9 commits into from Feb 22, 2017
Merged

Circleci mac #92

merged 9 commits into from Feb 22, 2017

Conversation

doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Feb 21, 2017

@dnadeau4 you got a mac circleci now

@dnadeau4
Copy link
Contributor

dnadeau4 commented Feb 22, 2017

@doutriaux1 Can you solve the conflicts? I tried to revert my 2 previous pull request but that did not help.

@doutriaux1
Copy link
Contributor Author

doutriaux1 commented Feb 22, 2017

@dnadeau4 no more conflicts, I reverted master to before your reverts

@doutriaux1
Copy link
Contributor Author

doutriaux1 commented Feb 22, 2017

@dnadeau4 if tests pass feel free to merge

@dnadeau4 dnadeau4 merged commit 519dccd into master Feb 22, 2017
@dnadeau4 dnadeau4 deleted the circleci_mac branch Feb 24, 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.

None yet

2 participants