From ce3ec7a3a33bd132882c11bddd1cbd881d1b9447 Mon Sep 17 00:00:00 2001 From: Luke Weiler Date: Fri, 16 Oct 2020 14:30:09 -0400 Subject: [PATCH] Update mathgen.py --- mathgenerator/mathgen.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 4403964..64e935f 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -1,13 +1,6 @@ import random -<<<<<<< HEAD -<<<<<<< HEAD import math -======= import fractions ->>>>>>> Add intersection of two lines. -======= -import fractions ->>>>>>> d3ebe8e5fb01015d27b5076a1430b872c779c6b0 genList = []