Updated gitignore

2022-08-08 10:28:10 -07:00
parent 2d47d1814e
commit 499c26ca67
1 changed files with 0 additions and 3 deletions
@@ -3,11 +3,8 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

-<<<<<<< HEAD
 .tmp

-=======
->>>>>>> main
 # User-specific files
 *.rsuser
 *.suo