fix missed merge conflict
This commit is contained in:
parent
21ca91d801
commit
23be617f3a
@ -1,10 +1,6 @@
|
||||
{
|
||||
"name": "pg",
|
||||
<<<<<<< HEAD
|
||||
"version": "0.15.1",
|
||||
=======
|
||||
"version": "1.0.0",
|
||||
>>>>>>> v1.0
|
||||
"description": "PostgreSQL client - pure javascript & libpq with the same API",
|
||||
"keywords": [
|
||||
"postgres",
|
||||
|
Loading…
Reference in New Issue
Block a user