From 8d9a62a87dafd87381829b00b85753db510eef2b Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Mon, 9 Dec 2019 13:08:58 -0500
Subject: moved the conflicts column back to its proper position in the enum
 removed unnecessary compat code

---
 src/modlist.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/modlist.h')

diff --git a/src/modlist.h b/src/modlist.h
index ce439f7b..3626c50c 100644
--- a/src/modlist.h
+++ b/src/modlist.h
@@ -57,6 +57,7 @@ public:
 
   enum EColumn {
     COL_NAME,
+    COL_CONFLICTFLAGS,
     COL_FLAGS,
     COL_CONTENT,
     COL_CATEGORY,
@@ -66,8 +67,7 @@ public:
     COL_INSTALLTIME,
     COL_PRIORITY,
     COL_NOTES,
-    COL_CONFLICTFLAGS,
-    COL_LASTCOLUMN = COL_CONFLICTFLAGS,
+    COL_LASTCOLUMN = COL_NOTES,
   };
 
   typedef boost::signals2::signal<void (const QString &, ModStates)> SignalModStateChanged;
-- 
cgit v1.3.1