git: fd05ce71c736 - stable/13 - dtrace.1: Resolve merge conflict

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Thu, 31 Jul 2025 00:07:50 UTC

The branch stable/13 has been updated by emaste:

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

commit fd05ce71c736143f0b3f569765f5374956ce8c10
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-07-30 18:05:29 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2025-07-31 00:06:49 +0000

    dtrace.1: Resolve merge conflict
    
    PR: 288556
    Fixes: 0c91fa982437 ("dtrace_fbt.4: Document the DTrace fbt provider")
    (cherry picked from commit 185bd9cf219999a38093e853bfda8ed1ca21fc5b)
---
 cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
index 9b6eb03226a9..853538949a4d 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
+++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
@@ -18,13 +18,9 @@
 .\" CDDL HEADER END
 .\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved.
 .\"
-<<<<<<< HEAD
-.Dd June 14, 2025
-=======
 .\" $FreeBSD$
 .\"
 .Dd July 16, 2025
->>>>>>> 9388c2887817 (dtrace_fbt.4: Document the DTrace fbt provider)
 .Dt DTRACE 1
 .Os
 .Sh NAME