git: 1bb7c45c532f - main - wg: Fix a mismerge

[Mark Johnston]

On Mon, Mar 08, 2021 at 12:05:37PM -0600, Kyle Evans wrote:
> On Mon, Mar 8, 2021 at 11:58 AM Mark Johnston <markj at freebsd.org> wrote:
> >
> > The branch main has been updated by markj:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=1bb7c45c532f3de76120db05739ac4ee34403091
> >
> > commit 1bb7c45c532f3de76120db05739ac4ee34403091
> > Author:     Mark Johnston <markj at FreeBSD.org>
> > AuthorDate: 2021-03-08 17:56:14 +0000
> > Commit:     Mark Johnston <markj at FreeBSD.org>
> > CommitDate: 2021-03-08 17:56:14 +0000
> >
> >     wg: Fix a mismerge
> >
> >     df55485085 fixed a leak that I had initially fixed in a11009dccb.
> >
> >     Fixes:  a11009dccb
> 
> Whoops, sorry about that. :-( I didn't check for conflicting work here.

It's my fault, I saw your commit before I pushed and amended the commit
log message accordingly, but then failed to actually update the diff. :/