From 9c868077db569a606ec465557d9d693bcd3abd34 Mon Sep 17 00:00:00 2001
From: Mohammad Amoush <mohammad_amoush@brown.edu>
Date: Tue, 16 Jul 2019 19:31:40 -0400
Subject: Merge Fixed

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 376d3db77..28c975500 100644
--- a/package.json
+++ b/package.json
@@ -205,4 +205,4 @@
         "xoauth2": "^1.2.0",
         "youtube": "^0.1.0"
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-70-g09d2