git: b9e32d8c8f51 - stable/13 - Clean up botched merge.

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

From: Dag-Erling Smørgrav <des_at_FreeBSD.org>
Date: Thu, 04 Apr 2024 12:07:30 UTC

The branch stable/13 has been updated by des:

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

commit b9e32d8c8f51f053988e45b61d90f3bc9cb77fb0
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2024-04-04 12:07:00 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2024-04-04 12:07:00 +0000

    Clean up botched merge.
    
    Fixes:          6895133fe293902f19a060c0cf229ea9b23bb555
---
 etc/mtree/BSD.tests.dist | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 82c77c6d43c7..98450e1cafbd 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -1105,13 +1105,8 @@
         ..
         tar
         ..
-<<<<<<< HEAD
-=======
-        tftp
-        ..
         touch
         ..
->>>>>>> 74a4aa9b1517 (touch: Add unit tests.)
         tr
         ..
         truncate