Testing a Merge fix

This commit is contained in:
Eric Vasquez
2024-11-10 18:24:17 -06:00
parent 63fe0846aa
commit 1eafad0159
37 changed files with 1605 additions and 2013 deletions

1
.gitignore vendored
View File

@@ -3,6 +3,7 @@ obj/
publish/
tools/
src/.vs/
src/*/.vs/
*.suo
*.user
*.DotSettings