Skip to content

Commit 87cc27c

Browse files
committed
2 parents 0ed896b + e5f2d76 commit 87cc27c

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

physics/mirror_formulae.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@
5757
5858
"""
5959

60+
<<<<<<< HEAD
61+
=======
62+
from math import isclose
63+
64+
>>>>>>> e5f2d76ef48721e71993e4b491c4bb4ce23f74c0
6065

6166
def focal_length(distance_of_object: float, distance_of_image: float) -> float:
6267
"""

0 commit comments

Comments
 (0)