Merge branch 'microsoft:main' into main

4 years ago · c097525ac1
parent 9db67b2b9e a074a792a5
commit c097525ac1
1 changed files with 3 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,7 +13,7 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

-# Mono auto generated files
+# Mono auto-generated files
 mono_crash.*

 # Build results
@ -40,7 +40,7 @@ bld/

 dist/

-# Visual Studio 2017 auto generated files
+# Visual Studio 2017 auto-generated files
 Generated\ Files/

 # MSTest test Results
@ -354,4 +354,4 @@ MigrationBackup/
 .ionide/

 # Mac-specific
-.DS_Store
+.DS_Store