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

[Graham Bloice <graham.bloice@xxxxxxxxxxxxx>]

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