cartodb/node-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix missed merge conflict

Browse Source
This commit is contained in:
bmc 2013-04-04 11:58:38 -05:00
parent 21ca91d801
commit 23be617f3a
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -1,10 +1,6 @@
{ {
"name": "pg", "name": "pg",
<<<<<<< HEAD
"version": "0.15.1",
=======
"version": "1.0.0", "version": "1.0.0",
>>>>>>> v1.0
"description": "PostgreSQL client - pure javascript & libpq with the same API", "description": "PostgreSQL client - pure javascript & libpq with the same API",
"keywords": [ "keywords": [
"postgres", "postgres",