Merge: resolve Roboto-Bold SDF conflict

This commit is contained in:
Leo Qu
2026-03-03 20:23:32 -05:00
parent faf9b62c30
commit 2ee0888932
5 changed files with 6121 additions and 9851 deletions

View File

@@ -8,6 +8,9 @@ EditorUserSettings:
RecentlyUsedSceneGuid-0:
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0
RecentlyUsedSceneGuid-1:
value: 00500c5353540d5f5c5b0f7311770645134e417c787a77637c7b4e31bbb76368
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0
@@ -27,3 +30,4 @@ EditorUserSettings:
m_VCAllowAsyncUpdate: 1
m_VCScanLocalPackagesOnConnect: 1
m_ArtifactGarbageCollection: 1
m_CompressAssetsOnImport: 1