Wireshark-dev: Re: [Wireshark-dev] [Patch] epan/libwireshark.def
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
Date: Wed, 31 Oct 2007 17:41:33 +0000
Gisle Vanem wrote:
> What does the lines like "<<< .mine" do in this file?
> Besides eth_stdio_fopen() shall not be exported from libwireshark.dll.
>   
Whoever last committed the file had an unresolved conflict.  The <<<<<
and >>>> are svn conflict markers.  svn log will tell you the guilty party.

-- 
Regards,

Graham Bloice