Changes for doctest 2

vipinkarthic · vipinkarthic · commit 8affc05a9c19 · 2023-10-05T09:19:51.000+05:30
diff --git a/physics/mirror_formulae.py b/physics/mirror_formulae.py
@@ -57,11 +57,6 @@
 
 """
 
-<<<<<<< HEAD
-=======
-from math import isclose
-
->>>>>>> e5f2d76ef48721e71993e4b491c4bb4ce23f74c0
 
 def focal_length(distance_of_object: float, distance_of_image: float) -> float:
     """
