Resolving conflicts

[Ralf Habacker]

Hi Bob,
> I've resolved all the conflicts in:
>
> bin
> config.test
> debian
> doc
There seems to be a problem with the doc/html dir, all the files has a dead
state.
...
revision 1.1.1.1.2.1
date: 2002/11/21 06:56:26;  author: tanner;  state: dead;  lines: +0 -0
...



full log
============================================================
RCS file: /cvsroot/kde-cygwin/qt-3/doc/html/index.html,v
Working file: index.html
head: 1.1
branch: 1.1.1
locks: strict
access list:
symbolic names:
        QT_CYGWIN_3_1_BRANCH: 1.1.1.1.0.2
        QT_CYGWIN_3_0_4_B1: 1.1.1.1
        qt_3_0_4: 1.1.1.1
        RALF: 1.1.1
keyword substitution: kv
total revisions: 3;     selected revisions: 3
description:
----------------------------
revision 1.1
date: 2002/06/22 21:14:18;  author: habacker;  state: Exp;
branches:  1.1.1;
Initial revision
----------------------------
revision 1.1.1.1
date: 2002/06/22 21:14:18;  author: habacker;  state: Exp;  lines: +0 -0
branches:  1.1.1.1.2;
imported missing files
----------------------------
revision 1.1.1.1.2.1
date: 2002/11/21 06:56:26;  author: tanner;  state: dead;  lines: +0 -0
Resolve the $ID$ tag issues detailed here:

http://lists.kde.org/?l=kde-cygwin&m=103743528326316&w=2

First attempt at resolving the other conflicts from the merge.
~

Ralf