git: 28290a18e217 - stable/14 - ffs.3: Fix an accidentally committed merge left over
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 30 Oct 2025 08:11:00 UTC
The branch stable/14 has been updated by gbe:
URL: https://cgit.FreeBSD.org/src/commit/?id=28290a18e217ed5837549e1ee022766403d63133
commit 28290a18e217ed5837549e1ee022766403d63133
Author: Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2025-10-30 08:07:00 +0000
Commit: Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2025-10-30 08:07:00 +0000
ffs.3: Fix an accidentally committed merge left over
Fix an accidentally committed merge left over.
Fixes: 38a172d3c6b7 ("ffs.3: Add a STANDARDS section to the manual page")
---
lib/libc/string/ffs.3 | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lib/libc/string/ffs.3 b/lib/libc/string/ffs.3
index 9e0b39dce573..1cca54c0b30b 100644
--- a/lib/libc/string/ffs.3
+++ b/lib/libc/string/ffs.3
@@ -27,9 +27,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-<<<<<<< HEAD
-.\" @(#)ffs.3 8.2 (Berkeley) 4/19/94
-.\"
.Dd October 25, 2025
.Dt FFS 3
.Os