Resolving conflicts

Bob Tanner
Thu, 21 Nov 2002 00:53:55 -0600

I'm diving to resolving the non $Id$ conflicts. Since I'm pretty new to t=
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 i=
n the=20

I'm not familiar enough with the code to know how to resolve most of thes=
Bob Tanner <>         | Phone : (952)943-8700, Minnesota, Linux | Fax   : (952)943-8500             | Linux Just Works!        =20
Key fingerprint =3D AB15 0BDF BCDE 4369 5B42  1973 7CF1 A709 2CC1 B288