From 23be617f3adab2c430e40c9c27fbb9432f5dba25 Mon Sep 17 00:00:00 2001
From: bmc <brian.m.carlson@gmail.com>
Date: Thu, 4 Apr 2013 11:58:38 -0500
Subject: [PATCH] fix missed merge conflict

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 4305926c..151e33f4 100644
--- 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",