On Mon, Mar 8, 2021 at 11:58 AM Mark Johnston <[email protected]> wrote:
>
> The branch main has been updated by markj:
>
> URL: 
> https://cgit.FreeBSD.org/src/commit/?id=1bb7c45c532f3de76120db05739ac4ee34403091
>
> commit 1bb7c45c532f3de76120db05739ac4ee34403091
> Author:     Mark Johnston <[email protected]>
> AuthorDate: 2021-03-08 17:56:14 +0000
> Commit:     Mark Johnston <[email protected]>
> 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.
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "[email protected]"

Reply via email to