[Midnightbsd-cvs] src: contrib/file: Resolve conflicts

[laffer1 at midnightbsd.org]

Log Message:
-----------
Resolve conflicts

Modified Files:
--------------
    src/contrib/file:
        file.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/contrib/file/file.h?r1=1.3&r2=1.4)
        funcs.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/contrib/file/funcs.c?r1=1.3&r2=1.4)
        magic.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/contrib/file/magic.c?r1=1.3&r2=1.4)