From e95a1ff1f830f127feab7e854c392186fa39812d Mon Sep 17 00:00:00 2001
From: Braeden Sowinski <sowinskibraeden@gmail.com>
Date: Mon, 20 Jun 2022 22:32:15 -0700
Subject: [PATCH] better variable name

---
 scheduleGenerator/generator.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scheduleGenerator/generator.py b/scheduleGenerator/generator.py
index 138b78d..1b038f1 100644
--- a/scheduleGenerator/generator.py
+++ b/scheduleGenerator/generator.py
@@ -43,12 +43,12 @@ def getLineNumber(): return currentframe().f_back.f_lineno
 
 # Takes in information to create or add a new conflict
 # Returns if the particular student has a previous error
-def newConflict(pupilNum: str, email: str, type: str, code: str, description: str, logs: dict) -> bool:
+def newConflict(pupilNum: str, email: str, conflictType: str, code: str, description: str, logs: dict) -> bool:
   exists = True if pupilNum in logs else False
   if exists: logs[pupilNum].append({
       "Pupil #": pupilNum,
       "Email": email,
-      "Type": type,
+      "Type": conflictType,
       "Code": code,
       "Conflict": description
     })
@@ -56,7 +56,7 @@ def newConflict(pupilNum: str, email: str, type: str, code: str, description: st
     logs[pupilNum] = [{
       "Pupil #": pupilNum,
       "Email": email,
-      "Type": type,
+      "Type": conflictType,
       "Code": code,
       "Conflict": description
     }]