Permalink
Browse files

fix missed merge conflict

  • Loading branch information...
brianc committed Apr 4, 2013
1 parent 21ca91d commit 23be617f3adab2c430e40c9c27fbb9432f5dba25
Showing with 0 additions and 4 deletions.
  1. +0 −4 package.json
View
@@ -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",

0 comments on commit 23be617

Please sign in to comment.