solves merge conflict

debug-js · Aug 12, 2017 · 62589c0 · 62589c0
1 parent 55e5c5e
commit 62589c0
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/node.js b/src/node.js
@@ -55,8 +55,6 @@ exports.inspectOpts = Object.keys(process.env).filter(function (key) {
     .toLowerCase()
     .replace(/_([a-z])/g, function (_, k) { return k.toUpperCase() });
 
-    console.log('key', key);
-
   // coerce string value into JS value
   var val = process.env[key];
   if (/^(yes|on|true|enabled)$/i.test(val)) val = true;
@@ -120,11 +118,7 @@ function formatArgs(args) {
 }
 
 function getDate() {
-<<<<<<< Updated upstream
-  if ('hideTtyDate' in this.inspectOpts && this.inspectOpts.hideTtyDate) {
-=======
   if ('hideTtyDate' in exports.inspectOpts && exports.inspectOpts.hideTtyDate) {
->>>>>>> Stashed changes
     return '';
   } else {
     return new Date().toISOString() + ' ';