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

merge for Nicole #7

Open
wants to merge 1 commit into
base: nicolejeffery/cosim2/new-branch
Choose a base branch
from

Conversation

mark-petersen
Copy link

this one will have conflicts

@njeffery
Copy link

njeffery commented Aug 5, 2014

Good!

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