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

sam4l: fixup master from conflicting PRs #1096

Merged
merged 1 commit into from Jul 7, 2018

Conversation

@ppannuto
Copy link
Member

commented Jul 7, 2018

Pull Request Overview

This was predicted by #1068, but I forgot about it because this had
been sitting for a while, sorry.

Testing Strategy

Compiling.

Documentation Updated

  • Updated the relevant files in /docs, or no updates are required.

Formatting

  • Ran make formatall.
sam4l: fixup master from conflicting PRs
This was predicted by #1068, but I forgot about it because this had
been sitting for a while, sorry.
@alevy
alevy approved these changes Jul 7, 2018

@alevy alevy merged commit a7515d3 into master Jul 7, 2018

3 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
deploy/netlify Deploy preview ready!
Details

@alevy alevy deleted the optional-cell-fixup branch Jul 7, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.