Merge due to version control issue

1 files changed, 7 insertions, 9 deletions

diff --git a/CST116F2021-Lab9/CST116F2021-Lab9.cpp b/CST116F2021-Lab9/CST116F2021-Lab9.cpp
index f923ec5..22d608b 100644
--- a/CST116F2021-Lab9/CST116F2021-Lab9.cpp
+++ b/CST116F2021-Lab9/CST116F2021-Lab9.cpp
@@ -55,7 +55,7 @@ int main(void)
     {
         cout << data[idx] << " ";
     }
-    
+
     cout << endl;
 
     return (0);
@@ -165,7 +165,7 @@ int main(void)
     }
 
     populateMetaData(metaData, mainData, numEntries); //Make fist map
-    bubiSortIndex(metaData[0], metaData[1], numEntries); 
+    bubiSortIndex(metaData[0], metaData[1], numEntries);
 
     cout << "Personnel manifest explorer MK1" << endl;
 
@@ -279,8 +279,7 @@ int main(void)
 
                     break;
                 }
-            }
-            while (menuChoice != 5);
+            } while (menuChoice != 5);
 
             menuChoice = -1; //Reset menu value to avoid program exit
 
@@ -311,8 +310,7 @@ int main(void)
         populateMetaData(metaData, mainData, numEntries); //Regenerate map
         bubiSortIndex(metaData[0], metaData[1], numEntries);
 
-    }
-    while (menuChoice != 5);
+    } while (menuChoice != 5);
 
     return (0);
 }
@@ -360,7 +358,7 @@ void swapDataArray(string dataArray[4][MV_3], int meta[MV_3], int &entries)
 
     for (int idx = 0; idx < entries; idx++)
     {
-        if(meta[idx] > 0)
+        if (meta[idx] > 0)
         {
             for (int idy = 0; idy < 4; idy++)
             {
@@ -385,7 +383,7 @@ void populateMetaData(int meta[2][MV_3], string dataAray[4][MV_3], int entries)
 }
 
 //Opens a file at the provied path, the enters its contents into an array. Returns false if there is an I/O error.
-bool populateDataArray(string fileLoc, string dataArray[4][MV_3], int &numEntries)
+bool populateDataArray(string fileLoc, string dataArray[4][MV_3], int& numEntries)
 {
     ifstream inputFile;
     bool isFileOpen = false;
@@ -430,7 +428,7 @@ bool getInt(int& innum)
 
     if (!cin.good())
     {
-        cin.clear(); 
+        cin.clear();
         cin.ignore(numeric_limits<streamsize>::max(), '\n');
 
         valid = false;