Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

ElementProperty improvements #346

Merged
merged 7 commits into from
Dec 17, 2018
Merged

Conversation

ardunn
Copy link
Contributor

@ardunn ardunn commented Dec 17, 2018

Summary

@computron
Copy link
Contributor

Thanks! I am going to merge but then rename a bunch of things immediately afterward.

In the future, please don't mix multiple things (formatting changes, hot fixes, and a feature addition) in the same PR. In particular, the formatting changes are things that cause merge conflicts frequently, and it's best to separate those out into its own PR

@computron computron merged commit 0c2bdf7 into hackingmaterials:master Dec 17, 2018
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants