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

_______________________________________________
Wireshark-dev mailing list
[email protected]
http://www.wireshark.org/mailman/listinfo/wireshark-dev

Reply via email to