diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2024-04-04 12:07:00 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2024-04-04 12:07:00 +0000 |
| commit | b9e32d8c8f51f053988e45b61d90f3bc9cb77fb0 (patch) | |
| tree | 258e1107f1c46611e07300532a522f52c8107fea /etc/mtree | |
| parent | 6895133fe293902f19a060c0cf229ea9b23bb555 (diff) | |
Clean up botched merge.
Diffstat (limited to 'etc/mtree')
| -rw-r--r-- | etc/mtree/BSD.tests.dist | 5 |
1 files changed, 0 insertions, 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 |