diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2023-01-20 11:21:08 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2023-01-20 11:22:57 +0000 |
| commit | 1852ca25dd2e8862e1f84c45a1140d1c508d0f59 (patch) | |
| tree | 79a1b48140b123daa8909505ce042e2b6be95f5b | |
| parent | 9b9f054e739887d18f2f5985d91ba5b954ad4a6a (diff) | |
| download | src-1852ca25dd2e8862e1f84c45a1140d1c508d0f59.tar.gz src-1852ca25dd2e8862e1f84c45a1140d1c508d0f59.zip | |
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
| -rw-r--r-- | tests/sys/posixshm/posixshm_test.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index a7b2e19f38af..9d5832999b9d 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -1781,13 +1781,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, cloexec); ATF_TP_ADD_TC(tp, mode); ATF_TP_ADD_TC(tp, fallocate); -<<<<<<< HEAD -||||||| parent of 91ddfd352f59 (posixshm_test: add naive page accounting test) - ATF_TP_ADD_TC(tp, fspacectl); -======= - ATF_TP_ADD_TC(tp, fspacectl); ATF_TP_ADD_TC(tp, accounting); ->>>>>>> 91ddfd352f59 (posixshm_test: add naive page accounting test) ATF_TP_ADD_TC(tp, largepage_basic); ATF_TP_ADD_TC(tp, largepage_config); ATF_TP_ADD_TC(tp, largepage_mmap); |