From 638879c606302f809ba4fcdc431a289a8bc01c2e Mon Sep 17 00:00:00 2001
From: Melissa Zhang <mzhang19096@gmail.com>
Date: Tue, 7 Jul 2020 10:24:22 -0700
Subject: merge with master

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

(limited to 'package.json')

diff --git a/package.json b/package.json
index 89af3b0b5..48e535fe4 100644
--- a/package.json
+++ b/package.json
@@ -248,4 +248,4 @@
         "xoauth2": "^1.2.0",
         "xregexp": "^4.3.0"
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-70-g09d2