author | zautrix <zautrix> | 2005-08-17 22:49:32 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-17 22:49:32 (UTC) |
commit | a685e90ea183cba87e852d6f6272e54704034347 (patch) (unidiff) | |
tree | f773086786d564866c4d5b7ca08fb510ebf0eb0b | |
parent | ede1d2a3a3d772cabc54ec117006ec6f445485cc (diff) | |
download | kdepimpi-a685e90ea183cba87e852d6f6272e54704034347.zip kdepimpi-a685e90ea183cba87e852d6f6272e54704034347.tar.gz kdepimpi-a685e90ea183cba87e852d6f6272e54704034347.tar.bz2 |
oops
-rw-r--r-- | korganizer/calendarview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 898da6c..e3b62de 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -3031,5 +3031,5 @@ void CalendarView::changeEventDisplay(Event *which, int action) | |||
3031 | // if (which->getTodoStatus()) { | 3031 | // if (which->getTodoStatus()) { |
3032 | mTodoList->updateView(); | 3032 | mTodoList->updateView(); |
3033 | if ( action != KOGlobals::EVENTDELETED ) { | 3033 | if ( action != KOGlobals::EVENTDELETED && KOPrefs::instance()->mDetectConflicts ) { |
3034 | mConflictingEvent = which ; | 3034 | mConflictingEvent = which ; |
3035 | int time = 1000; | 3035 | int time = 1000; |