git: 1852ca25dd2e - stable/13 - Remove merge conflict leftovers

The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=1852ca25dd2e8862e1f84c45a1140d1c508d0f59

commit 1852ca25dd2e8862e1f84c45a1140d1c508d0f59
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-01-20 11:21:08 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-01-20 11:22:57 +0000

    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 | 6 ------
 1 file changed, 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);