From b3331ef2c0b50ab2cea4c328e78f6ab58bca099d Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Fri, 6 Dec 2019 23:12:18 -0600
Subject: Separate conflict flags and render them in separate columns

---
 src/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a46908ef..d0215930 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -114,6 +114,7 @@ SET(organizer_SRCS
     previewdialog.cpp
     aboutdialog.cpp
     modflagicondelegate.cpp
+    modconflicticondelegate.cpp
     genericicondelegate.cpp
     organizerproxy.cpp
     viewmarkingscrollbar.cpp
@@ -238,6 +239,7 @@ SET(organizer_HDRS
     previewdialog.h
     aboutdialog.h
     modflagicondelegate.h
+    modconflicticondelegate.h
     genericicondelegate.h
     organizerproxy.h
     viewmarkingscrollbar.h
@@ -491,6 +493,7 @@ set(widgets
 	loglist
 	loghighlighter
 	modflagicondelegate
+	modconflicticondelegate
 	modidlineedit
 	noeditdelegate
 	qtgroupingproxy
-- 
cgit v1.3.1