solves merge conflict

debug-js · Aug 12, 2017 · 428a07a · 428a07a
1 parent 55e5c5e
commit 428a07a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/node.js b/src/node.js
@@ -120,11 +120,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() + ' ';