Paul Sandoz wrote:
> Joe Wang wrote:
>
>> Paul Sandoz wrote:
>>
>>> Hi Joe,
>>>
>>> Be careful to resolve conflicts when committing back files.
>>>
>> Oops, sorry. I did a "update -RAd" before checking in and did resolve
>> conflicts in a couple of source files. It was version 1.8 as shown in
>> the cvs email. But I must have accidentally removed that line when
>> editing. It happens from time to time the mouse pointer jumps and
>> part of file in editor gets highlighted when I use the toughpad. I
>> should have double-checked the cvs email. Sorry about that.
>>
>
> No problem, there were no issues with the other files :-)
It's such a big diff file, I admit I skipped reviewing many in the
middle :-)
Joe
>
> Paul.
>