Resolving conflicts

[Bob Tanner]

I'm diving to resolving the non $Id$ conflicts. Since I'm pretty new to t=
his=20
project, I'm not sure how to proceed, so I'll just post my questions as I=
=20
come to them.

I've resolved all the conflicts expect for 21 of them, and they are all i=
n the=20
qmake/generators/unix/unixmake2.cpp.

I'm not familiar enough with the code to know how to resolve most of thes=
e=20
conflicts.
--=20
Bob Tanner <tanner@real-time.com>         | Phone : (952)943-8700
http://www.mn-linux.org, Minnesota, Linux | Fax   : (952)943-8500
http://www.linuxjustworks.com             | Linux Just Works!        =20
Key fingerprint =3D AB15 0BDF BCDE 4369 5B42  1973 7CF1 A709 2CC1 B288