| author | zautrix <zautrix> | 2005-08-24 18:38:31 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-08-24 18:38:31 (UTC) |
| commit | 2cde25d8061acd536bccd698722952ce8555f5db (patch) (unidiff) | |
| tree | 70f905e5de57b44c3503883b2f98925d9c92ef8b /korganizer/koprefs.h | |
| parent | 645ceb7a95dce4716eb87a1b9191d3f3c1657be3 (diff) | |
| download | kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.zip kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.gz kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.bz2 | |
conflict res fix
| -rw-r--r-- | korganizer/koprefs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 576edf9..bac8010 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
| @@ -196,2 +196,3 @@ class KOPrefs : public KPimPrefs | |||
| 196 | bool mWeeklyRecur; | 196 | bool mWeeklyRecur; |
| 197 | bool mLongAllday; | ||
| 197 | bool mMonthDailyRecur; | 198 | bool mMonthDailyRecur; |
| @@ -353,2 +354,3 @@ class KOPrefs : public KPimPrefs | |||
| 353 | bool mDetectConflicts; | 354 | bool mDetectConflicts; |
| 355 | bool mIncludeFree; | ||
| 354 | bool mCheckConflictsAllDayAllDay; | 356 | bool mCheckConflictsAllDayAllDay; |