diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2025-07-30 18:05:29 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2025-07-30 18:06:38 +0000 |
| commit | 185bd9cf219999a38093e853bfda8ed1ca21fc5b (patch) | |
| tree | 6e7318e544b5131411f63253ccf885e645100732 /cddl | |
| parent | 943ad2ce59887a63182e5e26ea6962e978ac59bd (diff) | |
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 9cb6e9dd276f..0603a32da5e2 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,11 +20,7 @@ .\" .\" $FreeBSD$ .\" -<<<<<<< HEAD -.Dd June 14, 2025 -======= .Dd July 16, 2025 ->>>>>>> 9388c2887817 (dtrace_fbt.4: Document the DTrace fbt provider) .Dt DTRACE 1 .Os .Sh NAME |