[Midnightbsd-cvs] mports: Makefile: conflicts

[laffer1 at midnightbsd.org]

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

Modified Files:
--------------
    mports/graphics/linux-png10:
        Makefile (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/mports/graphics/linux-png10/Makefile?r1=1.2&r2=1.3)