fixed merge conflict

This commit is contained in:
Andreas Rumpf
2018-06-04 16:16:50 +02:00
committed by ringabout
parent e1b3dc208a
commit f503ef5fd9

View File

@@ -31,7 +31,7 @@
##
## .. code-block:: Nim
## import db_sqlite
## let db = open("localhost", "user", "password", "dbname")
## let db = open("mytest.db", nil, nil, nil) # user, password, database name can be nil
## db.close()
##
## Creating a table
@@ -57,7 +57,7 @@
##
## import db_sqlite, math
##
## let theDb = open("mytest.db", nil, nil, nil)
## let theDb = open("mytest.db", "", "", "")
##
## theDb.exec(sql"Drop table if exists myTestTbl")
## theDb.exec(sql("""create table myTestTbl (