[Midnightbsd-cvs] src: ipfilter/tools: resolve conflicts

[laffer1 at midnightbsd.org]

Log Message:
-----------
resolve conflicts

Modified Files:
--------------
    src/contrib/ipfilter/tools:
        ipfcomp.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/tools/ipfcomp.c?r1=1.2&r2=1.3)
        ipnat_y.y (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/tools/ipnat_y.y?r1=1.2&r2=1.3)