[Midnightbsd-cvs] src: encrypt.c: resolve conflicts

[laffer1 at midnightbsd.org]

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

Modified Files:
--------------
    src/crypto/heimdal/appl/telnet/libtelnet:
        encrypt.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/crypto/heimdal/appl/telnet/libtelnet/encrypt.c?r1=1.2&r2=1.3)