Illirik Smirnov 522d62229b Resolve merge conflict in PR #1041 (#1065) ...

* Add license comment

* Delete pool.js

2016-06-24 10:56:43 -05:00

..

native

Resolve merge conflict in PR #1041 (#1065)

2016-06-24 10:56:43 -05:00

client.js

Resolve merge conflict in PR #1041 (#1065)

2016-06-24 10:56:43 -05:00

connection-parameters.js

Resolve merge conflict in PR #1041 (#1065)

2016-06-24 10:56:43 -05:00

connection.js

Resolve merge conflict in PR #1041 (#1065)

2016-06-24 10:56:43 -05:00

defaults.js

Resolve merge conflict in PR #1041 (#1065)

2016-06-24 10:56:43 -05:00

index.js

Resolve merge conflict in PR #1041 (#1065)

2016-06-24 10:56:43 -05:00

pool-factory.js

Fix native constructor and pool exports (#1061)

2016-06-24 00:52:28 -05:00

query.js

Resolve merge conflict in PR #1041 (#1065)

2016-06-24 10:56:43 -05:00

result.js

Resolve merge conflict in PR #1041 (#1065)

2016-06-24 10:56:43 -05:00

type-overrides.js

Resolve merge conflict in PR #1041 (#1065)

2016-06-24 10:56:43 -05:00

utils.js

Resolve merge conflict in PR #1041 (#1065)

2016-06-24 10:56:43 -05:00