diff --git a/.gitignore b/.gitignore index 035335e3f..db100dee6 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ build*/ # Ignore local settings .vscode *.autosave +.vs # Ignore merge-conflict resolution files *.orig