git: e1341e5318a8 - stable/13 - stable/13 sbin/mount_nullfs: Resolve conlict in man page

The branch stable/13 has been updated by kib:

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

commit e1341e5318a8f6b2a2712fae799cb5c59194ea03
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-03-15 10:10:46 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-03-15 10:12:51 +0000

    stable/13 sbin/mount_nullfs: Resolve conlict in man page
    
    Reported by:    Seigo Tanimura <seigo.tanimura@gmail.com>
    Pointy hat to:  kib
---
 sbin/mount_nullfs/mount_nullfs.8 | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index 759f7546c49a..ed35ae310e63 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -90,17 +90,6 @@ flag followed by a comma separated string of options.
 See the
 .Xr mount 8
 man page for possible options and their meanings.
-<<<<<<< HEAD
-||||||| parent of 4a2a69c4472c (mount_nullfs(8): document -o cache and vfs.nullfs.cache_vnodes)
-Additionally the following option is supported:
-.Bl -tag -width indent
-.It Cm nocache
-Disable metadata caching in the null layer.
-Some lower-layer file systems may force this option.
-Depending on the access pattern,
-this may result in increased lock contention.
-.El
-=======
 Additionally the following option is supported:
 .Bl -tag -width nocache
 .It Cm nocache
@@ -111,7 +100,6 @@ this may result in increased lock contention.
 .It Cm cache
 Force enable metadata caching.
 .El
->>>>>>> 4a2a69c4472c (mount_nullfs(8): document -o cache and vfs.nullfs.cache_vnodes)
 .El
 .Pp
 The