From 08cd9cebbb50305285ba2a37bbaaa474e6baeb98 Mon Sep 17 00:00:00 2001
From: Mohammad Zain Abbas <mohammadzainabbas@gmail.com>
Date: Wed, 27 Jul 2022 19:11:13 +0200
Subject: [PATCH] Revert back some changes

---
 .gitignore            | 2 +-
 .vscode/settings.json | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 17c761af71..10401ee27f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@
 /Library/Homebrew/test/junit
 /Library/Homebrew/test/fs_leak_log
 /Library/Homebrew/vendor/portable-ruby
-#/Library/Taps
+/Library/Taps
 /Library/PinnedTaps
 /Library/Homebrew/.byebug_history
 /Library/Homebrew/sorbet/rbi/hidden-definitions/errors.txt
diff --git a/.vscode/settings.json b/.vscode/settings.json
index fe8a066e21..865fc53af2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -23,7 +23,5 @@
     "editor.codeActionsOnSave": {
       "source.fixAll.shellcheck": true,
     }
-  },
-  "git.mergeEditor": true,
-  "merge-conflict.autoNavigateNextConflict.enabled": true
+  }
 }