Resolve merge conflict in PR brianc#1041 (brianc#1065)

Illirik Smirnov · brianc · commit 522d62229bc1 · 2016-06-24T10:56:43.000-05:00
* Add license comment

* Delete pool.js
diff --git a/lib/client.js b/lib/client.js
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * README.md file in the root directory of this source tree.
+ */
+
 var crypto = require('crypto');
 var EventEmitter = require('events').EventEmitter;
 var util = require('util');
diff --git a/lib/connection-parameters.js b/lib/connection-parameters.js
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * README.md file in the root directory of this source tree.
+ */
+
 var url = require('url');
 var dns = require('dns');
 
diff --git a/lib/connection.js b/lib/connection.js
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * README.md file in the root directory of this source tree.
+ */
+
 var net = require('net');
 var EventEmitter = require('events').EventEmitter;
 var util = require('util');
diff --git a/lib/defaults.js b/lib/defaults.js
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * README.md file in the root directory of this source tree.
+ */
+
 var defaults = module.exports = {
   // database host. defaults to localhost
   host: 'localhost',
diff --git a/lib/index.js b/lib/index.js
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * README.md file in the root directory of this source tree.
+ */
+
 var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 var Client = require('./client');
diff --git a/lib/native/index.js b/lib/native/index.js
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * README.md file in the root directory of this source tree.
+ */
+
 var Native = require('pg-native');
 var TypeOverrides = require('../type-overrides');
 var semver = require('semver');
diff --git a/lib/native/query.js b/lib/native/query.js
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * README.md file in the root directory of this source tree.
+ */
+
 var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 var utils = require('../utils');
diff --git a/lib/native/result.js b/lib/native/result.js
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * README.md file in the root directory of this source tree.
+ */
+
 var NativeResult = module.exports = function(pq) {
   this.command = null;
   this.rowCount = 0;
diff --git a/lib/query.js b/lib/query.js
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * README.md file in the root directory of this source tree.
+ */
+
 var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 
diff --git a/lib/result.js b/lib/result.js
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * README.md file in the root directory of this source tree.
+ */
+
 var types = require('pg-types');
 
 //result object returned from query
diff --git a/lib/type-overrides.js b/lib/type-overrides.js
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * README.md file in the root directory of this source tree.
+ */
+
 var types = require('pg-types');
 
 function TypeOverrides(userTypes) {
diff --git a/lib/utils.js b/lib/utils.js
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * README.md file in the root directory of this source tree.
+ */
+
 var defaults = require('./defaults');
 
 // convert a JS array to a postgres array literal
