Fix merge conflicts, because I was too lazy to fix them beforehand.

DescentDevelopers · Aug 19, 2024 · 2114a1d · 2114a1d
1 parent 36e2c32
commit 2114a1d
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/cfile/cfile.cpp b/cfile/cfile.cpp
@@ -70,11 +70,6 @@ std::map<std::filesystem::path, std::filesystem::path> extensions;
 
 #define MAX_PATHS 100
 
-static path_entry paths[MAX_PATHS];
-static int N_paths = 0;
-#define MAX_EXTENSIONS 100
-static ext_entry extensions[MAX_EXTENSIONS];
-static int N_extensions;
 static std::shared_ptr<library> Libraries;
 static int lib_handle = 0;