Re: [Ftnpl-develop] OK, it's merged in.

[Russ J. <ru...@di...>]

I think we're going to need to not be changing things in the same file at 
the same time.

At 01:30 PM 8/27/2001 -0400, Robert Clay wrote:
>Russ,
>
>    And when I did an update this morning, it was able to merge your 
> changes with what I had, with no apparant problem...

Russ Johnson
Stargate Online

http://www.dimstar.net
telnet://telnet.dimstar.net
ICQ: 3739685