ANNOUNCEMENT: Live Wireshark University & Allegro Packets online APAC Wireshark Training Session
April 17th, 2024 | 14:30-16:00 SGT (UTC+8) | Online

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

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.