Fixed conflicts

This commit is contained in:
Metropass
2020-10-20 13:31:46 -04:00
parent 47abb39261
commit fda8aa5969

View File

@@ -94,5 +94,5 @@ from .degree_to_rad import *
from .radian_to_deg import * from .radian_to_deg import *
from .differentiation import * from .differentiation import *
from .definite_integral import * from .definite_integral import *
from .isprime import * from .is_prime import *
from .perimeter_of_polygons import * from .perimeter_of_polygons import *