[Midnightbsd-cvs] src: contrib/one-true-awk: Resolve conflicts

[laffer1 at midnightbsd.org]

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

Modified Files:
--------------
    src/contrib/one-true-awk:
        main.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/contrib/one-true-awk/main.c?r1=1.3&r2=1.4)
        b.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/contrib/one-true-awk/b.c?r1=1.3&r2=1.4)
        run.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/contrib/one-true-awk/run.c?r1=1.3&r2=1.4)