From cb93f035aa55f89503aee63584fd18cd1863e4dc Mon Sep 17 00:00:00 2001
From: Vanessa Yuen <vanessa.yh.yuen@gmail.com>
Date: Wed, 26 Jul 2017 15:22:06 -0400
Subject: [PATCH] fix previous merge conflict resolution for .gitignore

---
 .gitignore | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9043489a8..589ccd49b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,28 +37,6 @@
 /vendor/debian_wheezy_i386-sysroot/
 /vendor/download/
 /vendor/llvm-build/
-/vendor/.gclient
-node_modules/
-*.xcodeproj
-*.swp
-*.pyc
-*.VC.db
-*.VC.VC.opendb
-.vs/
-.vscode/
-*.vcxproj
-*.vcxproj.user
-*.vcxproj.filters
-*.sln
-*.log
-/brightray/brightray.opensdf
-/brightray/brightray.sdf
-/brightray/brightray.sln
-/brightray/brightray.vcxproj*
-/brightray/brightray.suo
-/brightray/brightray.v12.suo
-/brightray/brightray.xcodeproj/
-.env
 /vendor/llvm/
 /vendor/node/deps/node-inspect/.npmrc
 /vendor/npm/