From 356d17b2ea70d9bfdc36d8199e12eb21cd3d4669 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 31 Oct 2020 16:08:05 -0400
Subject: fixes after rebasing

---
 src/modinfodialogconflicts.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/modinfodialogconflicts.cpp')

diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index 0103b58a..cf7f6340 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -1001,7 +1001,7 @@ std::optional<ConflictItem> AdvancedConflictsTab::createItem(
 
     if (currOrigin->getID() == fileOrigin) {
       // current origin is the active winner, all alternatives go in 'before'
-      
+
       if (showAllAlts) {
         for (const auto& alt : alternatives)
         {
@@ -1023,7 +1023,7 @@ std::optional<ConflictItem> AdvancedConflictsTab::createItem(
     }
     else {
       // current mod is one of the alternatives, find its position
-      
+
       auto currOrgId = currOrigin->getID();
 
       auto currModIter = std::find_if(alternatives.begin(), alternatives.end(),
@@ -1037,14 +1037,14 @@ std::optional<ConflictItem> AdvancedConflictsTab::createItem(
       }
 
       isCurrOrigArchive = currModIter->isFromArchive();
-      
+
       if (showAllAlts) {
         // fills 'before' and 'after' with all the alternatives that come
-        // before and after the current mod, trusting the alternatives vector to be 
+        // before and after the current mod, trusting the alternatives vector to be
         // already sorted correctly
-        
+
         for (auto iter = alternatives.begin(); iter != alternatives.end(); iter++) {
-          
+
           const auto& altOrigin = ds.getOriginByID(iter->originID());
 
           if (iter < currModIter) {
@@ -1094,7 +1094,7 @@ std::optional<ConflictItem> AdvancedConflictsTab::createItem(
 
           after += ds.getOriginByID(fileOrigin).getName();
         }
-        
+
       }
     }
   }
-- 
cgit v1.3.1