CVS commit by kainhofe: 

Conflict resolution works now.  The conduit is now more or less finished


  M +54 -18    Icons/Makefile   1.2
  M +42 -6     Icons/Makefile.in   1.2
  M +97 -36    doc-conduit.cc   1.4
  M +12 -10    doc-conduit.h   1.3
  M +136 -99   doc-conflictdialog.cc   1.2
  M +37 -38    doc-conflictdialog.h   1.2
  M +4 -0      doc-factory.cc   1.3
  M +4 -1      doc-factory.h   1.3
  M +7 -0      doc-setup.cc   1.3
  M +42 -8     doc-setupdialog.ui   1.3
  M +3 -3      kpalmdoc.o   1.2