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/modinfowithconflictinfo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/modinfowithconflictinfo.cpp')

diff --git a/src/modinfowithconflictinfo.cpp b/src/modinfowithconflictinfo.cpp
index 79896cc3..12cbf416 100644
--- a/src/modinfowithconflictinfo.cpp
+++ b/src/modinfowithconflictinfo.cpp
@@ -35,7 +35,7 @@ std::vector<ModInfo::EFlag> ModInfoWithConflictInfo::getFlags() const
   switch (isLooseArchiveConflicted()) {
     case CONFLICT_MIXED: {
       result.push_back(ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE);
-	  result.push_back(ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN);
+      result.push_back(ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN);
     } break;
     case CONFLICT_OVERWRITE: {
       result.push_back(ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE);
-- 
cgit v1.3.1