Revert back some changes

This commit is contained in:
Mohammad Zain Abbas 2022-07-27 19:11:13 +02:00
parent 3dc1b9c231
commit 08cd9cebbb
2 changed files with 2 additions and 4 deletions

2
.gitignore vendored
View File

@ -17,7 +17,7 @@
/Library/Homebrew/test/junit /Library/Homebrew/test/junit
/Library/Homebrew/test/fs_leak_log /Library/Homebrew/test/fs_leak_log
/Library/Homebrew/vendor/portable-ruby /Library/Homebrew/vendor/portable-ruby
#/Library/Taps /Library/Taps
/Library/PinnedTaps /Library/PinnedTaps
/Library/Homebrew/.byebug_history /Library/Homebrew/.byebug_history
/Library/Homebrew/sorbet/rbi/hidden-definitions/errors.txt /Library/Homebrew/sorbet/rbi/hidden-definitions/errors.txt

View File

@ -23,7 +23,5 @@
"editor.codeActionsOnSave": { "editor.codeActionsOnSave": {
"source.fixAll.shellcheck": true, "source.fixAll.shellcheck": true,
} }
}, }
"git.mergeEditor": true,
"merge-conflict.autoNavigateNextConflict.enabled": true
} }