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

Add magnetic permittivity and coulomb constant in the void. #9

Merged
merged 4 commits into from Oct 7, 2018
Merged

Add magnetic permittivity and coulomb constant in the void. #9

merged 4 commits into from Oct 7, 2018

Conversation

advy99
Copy link
Contributor

@advy99 advy99 commented Oct 20, 2017

Reffered to #5

@JJ
Copy link
Owner

JJ commented Oct 21, 2017

I'm afraid this conflicts with a previous pull request I accepted. Can you please check and resubmit?

Copy link
Owner

@JJ JJ left a comment

Choose a reason for hiding this comment

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

Please check the conflict marks and eliminate them, leaving only the correct code.

@JJ JJ merged commit a25ab90 into JJ:master Oct 7, 2018
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