1 files changed, 0 insertions, 8 deletions

diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index 3ad5dc3d16be..05c42437297e 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -367,20 +367,12 @@ An orphaned file is one with an invalid owner or group.
 (str) A list of directories under which orphaned files are searched for.
 This would usually be set to
 .Pa / .
-<<<<<<< periodic.conf.5
-.It Ar weekly_status_pkg_dirs
-(bool) Set to
-.Dq YES
-if you want to report out-of-date packages installed using
-.Xr pkg_version 1 .
-=======
 .It Ar weekly_status_pkg_dirs
 (bool) Set to
 .Dq YES
 if you want to use
 .Xr pkg_version 1
 to list installed packages which are out of date.
->>>>>>> 1.4
 .It Ar weekly_local
 (str) Set to a list of extra scripts that should be run after all other
 weekly scripts.