summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Estelami <NEstelami@users.noreply.github.com>2022-07-11 18:52:48 -0400
committerNicholas Estelami <NEstelami@users.noreply.github.com>2022-07-31 16:57:04 -0400
commitf63260f0b73c6469784cffa8153ed50749c2cf3a (patch)
tree8b118ac34b2802d540944cfb9b3c4eef89f3f30b
parent6fdd4bd348330bcd115df54fd5396781faf1b25d (diff)
Fixed up merge issues and crash
-rw-r--r--ZAPD/Globals.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/ZAPD/Globals.cpp b/ZAPD/Globals.cpp
index 181e2dc..455205b 100644
--- a/ZAPD/Globals.cpp
+++ b/ZAPD/Globals.cpp
@@ -23,7 +23,6 @@ Globals::Globals()
singleThreaded = true;
verbosity = VerbosityLevel::VERBOSITY_SILENT;
outputPath = Directory::GetCurrentDirectory();
- singleThreaded = true;
}
Globals::~Globals()