From fbfef87ce05a01e842a9cd6d97ef0b8163eb8c5e Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Thu, 31 Mar 2016 12:25:40 -0400
Subject: [PATCH] Fixed a mismerge.

---
 Sources/Engine/Base/Stream.cpp | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/Sources/Engine/Base/Stream.cpp b/Sources/Engine/Base/Stream.cpp
index 4cb49ec..1fccd2d 100644
--- a/Sources/Engine/Base/Stream.cpp
+++ b/Sources/Engine/Base/Stream.cpp
@@ -161,22 +161,9 @@ void InitStreams(void)
 
   CPrintF(TRANSV("Loading group files...\n"));
 
+  CDynamicArray<CTString> *files = NULL;
+
   // for each group file in base directory
-  struct _finddata_t c_file;
-  long hFile;
-  hFile = _findfirst(_fnmApplicationPath+"*.gro", &c_file);
-  BOOL bOK = (hFile!=-1);
-  while(bOK) {
-    if (CTString(c_file.name).Matches("*.gro")) {
-      // add it to active set
-      UNZIPAddArchive(_fnmApplicationPath+c_file.name);
-    }
-    bOK = _findnext(hFile, &c_file)==0;
-  }
-  _findclose( hFile );
-
-  CDynamicArray<CTString> *files;
-
   files = _pFileSystem->FindFiles(_fnmApplicationPath, "*.gro");
   int max = files->Count();
   int i;