Add in-source build and install folders, as well as VS Code folders
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 5
− 1
The .gitignore file was reverted. Now, I'm adding back the in-source build and install folders, as well as the VS Code hidden folder
Since it is not affecting the code at all, only the git commits, I'm merging this directly.