Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
MarcoHampel 2023-09-10 21:37:12 -04:00
commit 84b455b473
3 changed files with 3 additions and 14 deletions

3
.gitignore vendored
View File

@ -72,3 +72,6 @@ crashlytics-build.properties
/[Aa]ssets/[Ss]treamingAssets/aa/*
omnisharp.json
/microsoft.unity.analyzers
.vscode
.idea

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 96a44475794fb6445a6f3c4b9ee13966
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 0957b521a08374f4aa508231735153bc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: