Skip to content

Commit 62589c0

Browse files
committed
solves merge conflict
1 parent 55e5c5e commit 62589c0

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

src/node.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ exports.inspectOpts = Object.keys(process.env).filter(function (key) {
5555
.toLowerCase()
5656
.replace(/_([a-z])/g, function (_, k) { return k.toUpperCase() });
5757

58-
console.log('key', key);
59-
6058
// coerce string value into JS value
6159
var val = process.env[key];
6260
if (/^(yes|on|true|enabled)$/i.test(val)) val = true;
@@ -120,11 +118,7 @@ function formatArgs(args) {
120118
}
121119

122120
function getDate() {
123-
<<<<<<< Updated upstream
124-
if ('hideTtyDate' in this.inspectOpts && this.inspectOpts.hideTtyDate) {
125-
=======
126121
if ('hideTtyDate' in exports.inspectOpts && exports.inspectOpts.hideTtyDate) {
127-
>>>>>>> Stashed changes
128122
return '';
129123
} else {
130124
return new Date().toISOString() + ' ';

0 commit comments

Comments
 (0)