From eb4fb404e5a30ac488ee12eaba656c52c3e3cca2 Mon Sep 17 00:00:00 2001
From: FatAnorexic <alexbernhardt23@gmail.com>
Date: Thu, 13 Jul 2023 15:06:56 -0400
Subject: [PATCH] fixed conflicts

---
 physics/basic_orbital_capture.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/physics/basic_orbital_capture.py b/physics/basic_orbital_capture.py
index b3e280fb5..4b5f1e3e8 100644
--- a/physics/basic_orbital_capture.py
+++ b/physics/basic_orbital_capture.py
@@ -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