]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9b9f054) | patch
Remove merge conflict leftovers
authorKonstantin Belousov <kib@FreeBSD.org>
Fri, 20 Jan 2023 11:21:08 +0000 (13:21 +0200)
committerKonstantin Belousov <kib@FreeBSD.org>
Fri, 20 Jan 2023 11:22:57 +0000 (13:22 +0200)
commit1852ca25dd2e8862e1f84c45a1140d1c508d0f59
tree79a1b48140b123daa8909505ce042e2b6be95f5btree | snapshot
parent9b9f054e739887d18f2f5985d91ba5b954ad4a6acommit | diff
Remove merge conflict leftovers

This is a direct commit to stable/13.

Reported by: Stefan Grundmann via https://github.com/freebsd/freebsd-src/pull/639
tests/sys/posixshm/posixshm_test.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.