Merge branch 'master' of https://github.com/vipinkarthic/Python

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