Wireshark-dev: Re: [Wireshark-dev] [Patch] epan/libwireshark.def
From: Gisle Vanem <[email protected]>
Date: Wed, 31 Oct 2007 20:30:08 +0100
"Guy Harris" <[email protected]> wrote:

If the first somebody was you, then "svn update" (or its GUI equivalent) should have reported the conflict. The "<<<<<<< .mine" lines aren't in the current version in SVN, so I suspect it's reporting a conflict between changes you made and changes somebody checked in.
It wasn't me (I don't have write access). But after a:
 del epan\libwireshark.def
 svn update

the file is up-to-date it seems.

--gv