From d2e48ed72e3526c08580d5c4b3531778267532c5 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Thu, 21 Sep 2023 17:43:29 -0500
Subject: Fix rebase issues

---
 src/settingsdialoggeneral.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/settingsdialoggeneral.cpp')

diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index 4ce72110..6a666437 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -160,7 +160,7 @@ void GeneralSettingsTab::resetDialogs()
 
 void GeneralSettingsTab::onEditCategories()
 {
-  CategoriesDialog dialog(m_PluginContainer, &dialog());
+  CategoriesDialog catDialog(m_PluginContainer, &dialog());
 
   if (catDialog.exec() == QDialog::Accepted) {
     catDialog.commitChanges();
-- 
cgit v1.3.1