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: Guy Harris <guy@xxxxxxxxxxxx>
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.