From 4436d376a8d426867f217b03838570a424b09c5f Mon Sep 17 00:00:00 2001
From: LostDragonist <lost.dragonist@gmail.com>
Date: Wed, 12 Dec 2018 20:26:35 -0600
Subject: Clean up and fix merge issues

---
 src/organizercore.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/organizercore.cpp')

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index d21fa844..acce25dc 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -788,12 +788,12 @@ std::wstring OrganizerCore::crashDumpsPath() {
 
 bool OrganizerCore::getArchiveParsing() const
 {
-	return m_ArchiveParsing;
+  return m_ArchiveParsing;
 }
 
 void OrganizerCore::setArchiveParsing(const bool archiveParsing)
 {
-	m_ArchiveParsing = archiveParsing;
+  m_ArchiveParsing = archiveParsing;
 }
 
 void OrganizerCore::setCurrentProfile(const QString &profileName)
@@ -1936,13 +1936,13 @@ std::vector<QString> OrganizerCore::enabledArchives()
 {
   std::vector<QString> result;
   if (m_ArchiveParsing) {
-	  QFile archiveFile(m_CurrentProfile->getArchivesFileName());
-	  if (archiveFile.open(QIODevice::ReadOnly)) {
-		  while (!archiveFile.atEnd()) {
-			  result.push_back(QString::fromUtf8(archiveFile.readLine()).trimmed());
-		  }
-		  archiveFile.close();
-	  }
+    QFile archiveFile(m_CurrentProfile->getArchivesFileName());
+    if (archiveFile.open(QIODevice::ReadOnly)) {
+      while (!archiveFile.atEnd()) {
+        result.push_back(QString::fromUtf8(archiveFile.readLine()).trimmed());
+      }
+      archiveFile.close();
+    }
   }
   return result;
 }
-- 
cgit v1.3.1