Resolved merge conflicts

2022-08-08 10:14:06 -07:00
parent 5013aff348 b75238c3f6
commit 2d47d1814e
4 changed files with 19 additions and 24 deletions
@@ -3,8 +3,11 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

+<<<<<<< HEAD
 .tmp

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