From fda8aa5969e0ebb3fd88f94abb23e24fe234a208 Mon Sep 17 00:00:00 2001 From: Metropass Date: Tue, 20 Oct 2020 13:31:46 -0400 Subject: [PATCH] Fixed conflicts --- mathgenerator/funcs/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index bbe9a87..4ab8ace 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -94,5 +94,5 @@ from .degree_to_rad import * from .radian_to_deg import * from .differentiation import * from .definite_integral import * -from .isprime import * +from .is_prime import * from .perimeter_of_polygons import *