From: Christos Zoulas <christos@zoulas.com>
Date: Sat, 5 Aug 2000 18:22:15 +0000 (+0000)
Subject: comment out things that will cause conflicts.
X-Git-Tag: FILE3_32~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8c2cd12d3171a71e1d2f2086c0b9a8959eb347f;p=file

comment out things that will cause conflicts.
---

diff --git a/magic/Magdir/apple b/magic/Magdir/apple
index 82ee9944..35dd4357 100644
--- a/magic/Magdir/apple
+++ b/magic/Magdir/apple
@@ -83,16 +83,17 @@
 # 
 # This will not identify ORCA/M source files, since those have
 # some sort of date code instead of the two zero bytes at 6 and 7
-
-4       belong&0xff00ffff       0x01000000      ORCA/EZ assembler source data
->5      byte                    x               \b, build number %d
+# XXX Conflicts with ELF
+#4       belong&0xff00ffff       0x01000000      ORCA/EZ assembler source data
+#>5      byte                    x               \b, build number %d
 
 # Broderbund Fantavision
 #
 # I don't know what these values really mean, but they seem to recur.
 # Will they cause too many conflicts?
 
-2	belong&0xFF00FF		0x040008	Fantavision movie data
+# Probably :-)
+#2	belong&0xFF00FF		0x040008	Fantavision movie data
 
 # Some attempts at images.
 #