summaryrefslogtreecommitdiff
path: root/ZAPDTR
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
commit44bf5af33a4cbf4610eb121c7df558d733ae6cd1 (patch)
tree1081d10ddd75e5ec4bfc80b72236f09c5453c761 /ZAPDTR
parent0193489b004f899fd7f17179b866a9d37f93042d (diff)
Fixed up merge issues and crash
Diffstat (limited to 'ZAPDTR')
-rw-r--r--ZAPDTR/ZAPD/Globals.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/ZAPDTR/ZAPD/Globals.cpp b/ZAPDTR/ZAPD/Globals.cpp
index 181e2dce8..455205b2a 100644
--- a/ZAPDTR/ZAPD/Globals.cpp
+++ b/ZAPDTR/ZAPD/Globals.cpp
@@ -23,7 +23,6 @@ Globals::Globals()
singleThreaded = true;
verbosity = VerbosityLevel::VERBOSITY_SILENT;
outputPath = Directory::GetCurrentDirectory();
- singleThreaded = true;
}
Globals::~Globals()