mathdatech/Python
1
0
Fork 0
mirror of https://github.com/TheAlgorithms/Python.git synced 2025-02-25 10:28:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
FatAnorexic 2023-07-13 15:06:56 -04:00
parent 002203a11c
commit eb4fb404e5
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
physics/basic_orbital_capture.py
View File

@ -1,11 +1,5 @@
<<<<<<< HEAD
from math import sqrt,pow
from scipy.constants import G, pi, c
=======
from math import sqrt, pow
from scipy.constants import G as g
from scipy.constants import pi as pi
>>>>>>> f38d19b7f916002e81e75dea3c4cc3749eb6ceea
"""
These two functions will return the radii of impact for a target object