Wireshark-dev: Re: [Wireshark-dev] [Patch] epan/libwireshark.def

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
Date: Wed, 31 Oct 2007 17:50:17 +0000
Guy Harris wrote:
> Graham Bloice wrote:
>
>   
>> Whoever last committed the file had an unresolved conflict.
>>     
>
> ...or Gisle does.  There aren't any conflict markers in the checked-in 
> version.
>   
Ack, I didn't actually check the repo, just assumed.

-- 
Regards,

Graham Bloice