Wireshark-dev: Re: [Wireshark-dev] [Patch] epan/libwireshark.def
From: Guy Harris <[email protected]>
Date: Wed, 31 Oct 2007 10:44:28 -0700
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.