Fixed merge conflict issues

This commit is contained in:
Pasha Bibko
2026-01-29 13:04:54 +00:00
parent 80e7d38a17
commit 13af242e69
3 changed files with 26 additions and 183 deletions

View File

@@ -66,7 +66,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0