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

Re-merge to correctly merge adapter pattern (PR #51) into master #53

Merged
merged 23 commits into from
Dec 6, 2017

Conversation

heyellieday
Copy link
Contributor

I mistakenly merged PR #51 into this branch instead of master. This PR merges the linked branch into master. The code was good to go so this PR is merely a formality to correct my merging misstep.

Ellie Day and others added 23 commits November 9, 2017 17:00
 - pass the adapter to collection fetch from make_brainstem_type
 - fix code formatting issues around indentations and trailing commas

Signed-off-by: Ellie Day <[email protected]>
… state

 - fix lint error around lengthy line of code in make brainstem type

Signed-off-by: Ellie Day <[email protected]>
…ded methods in model actions for adapter pattern
Signed-off-by: Bobby Brown <[email protected]>
Implement initial default adapter for upcoming adapter pattern
Copy link
Contributor

@bobby1190 bobby1190 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@heyellieday heyellieday merged commit 3d396f1 into master Dec 6, 2017
@heyellieday heyellieday deleted the make_brainstem_type_options branch December 6, 2017 21:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants