CVS: cvs.openbsd.org: src

[Marc Espie]

CVSROOT:        /cvs
Module name:    src
Changes by:     es...@cvs.openbsd.org   2012/11/28 22:18:03

Modified files:
        usr.bin/sqlite3: shell.c 

Log message:
fix stupid cvs conflict