From bd0f0feb2e1af8a346dc724c81f31214c52128e4 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Wed, 17 Aug 2005 22:44:12 +0000
Subject: conflict settings

---
(limited to 'korganizer/koprefsdialog.h')

diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index baa6cf9..ee7a7aa 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -147,6 +147,8 @@ class KOPrefsDialog : public KPrefsDialog
     QSpinBox     * mAlarmSuspendCount;
     QSpinBox     * mAlarmBeepInterval;
 
+    QComboBox * mFilterEditItem, *mFilterAllItem;
+
     QLineEdit * mDefaultAlarmFile;
     int mSpacingHint;
     int mMarginHint;
--
cgit v0.9.0.2