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

Restore mass and compute from 1.4 #8

Closed

Conversation

Edlingeer
Copy link
Contributor

No description provided.

@DanielSank
Copy link
Owner

Thanks! I combined some of these commits, fixed formatting and punctuation errors, and merged into master. Fortunately, I was able to keep the author of the commits as Edlingeer through this procedure, as you can see in the repository's commit history. Unfortunately, because I did some rebasing, our repositories will now have diverged a bit. You can fetch master from this repo but you may not be able to easily merge it into your repository.

Next time I'll ask you to make the edits so any history conflicts are avoided.

@Edlingeer
Copy link
Contributor Author

Edlingeer commented May 31, 2016 via email

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