[list] Resolving conflicts

[Chris January]

> I'm diving to resolving the non $Id$ conflicts. Since I'm pretty
> new to this
> project, I'm not sure how to proceed, so I'll just post my questions as I
> come to them.
>
> I've resolved all the conflicts expect for 21 of them, and they
> are all in the
> qmake/generators/unix/unixmake2.cpp.
>
> I'm not familiar enough with the code to know how to resolve most
> of these
> conflicts.
This is something I will look into when I have the time, but feel free to
try yourself.

Chris