From 93a975e114ee1c35f01ed3bdd47170e6f7129014 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Fri, 17 Feb 2017 17:05:49 -0800
Subject: Merge changes from github. Change: 147897309

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index e1fa12ea6a..07dd151380 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ node_modules
 *.pyc
 __pycache__
 *.swp
+.vscode/
\ No newline at end of file
-- 
cgit v1.2.3