From 428a07a9fc16ee49e82db87b0b525bc2b0bda9c9 Mon Sep 17 00:00:00 2001
From: Adrian Mejia <admejiar@cisco.com>
Date: Sat, 12 Aug 2017 15:24:45 -0400
Subject: [PATCH] solves merge conflict

---
 src/node.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/node.js b/src/node.js
index cb3b2194..6faacdda 100644
--- 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() + ' ';