CVS commit: src/dist/file/src

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sun Aug 31 07:54:07 UTC 2008

Modified Files:
        src/dist/file/src: magic.c

Log Message:
remove conflict.


To generate a diff of this commit:
cvs rdiff -r1.20 -r1.21 src/dist/file/src/magic.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.