21 #ifndef SINGLECONFLICTDIALOG_H
22 #define SINGLECONFLICTDIALOG_H
24 #include "conflictdialog.h"
25 #include <libkdepim/diffalgo.h>
30 class HTMLDiffAlgoDisplay;
39 SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
40 ~SingleConflictDialog();
43 void useFirstChange();
44 void useSecondChange();
45 void duplicateChange();
52 KSync::HTMLDiffAlgoDisplay *mDiffAlgoDisplay;
|