fix missed merge conflict

brianc · brianc · commit 23be617f3ada · 2013-04-04T11:58:38.000-05:00
diff --git a/package.json b/package.json
@@ -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",
