summaryrefslogtreecommitdiff
path: root/usr.bin/file/Header
diff options
context:
space:
mode:
authorpooka <pooka@NetBSD.org>2000-09-22 16:34:59 +0000
committerpooka <pooka@NetBSD.org>2000-09-22 16:34:59 +0000
commite5efd07a0bcfa67e020a523ca2712d5d429dc21e (patch)
tree95594a357126783c85bf2b817f3f723d6d8fb668 /usr.bin/file/Header
parentc45f82114cfbb9473b63a60442801cf660d65c8e (diff)
resolve conflicts
Diffstat (limited to 'usr.bin/file/Header')
-rw-r--r--usr.bin/file/Header1
1 files changed, 1 insertions, 0 deletions
diff --git a/usr.bin/file/Header b/usr.bin/file/Header
index 2c76925dc8a..3ca9b0eb2cc 100644
--- a/usr.bin/file/Header
+++ b/usr.bin/file/Header
@@ -1,3 +1,4 @@
+# Magic
# Magic data for file(1) command.
# Machine-generated from src/cmd/file/magdir/*; edit there only!
# Format is described in magic(files), where: