Merge remote-tracking branch 'origin/main' into work_branch
# Conflicts: # Packages/manifest.json
This commit is contained in:
@@ -46,6 +46,7 @@ MonoBehaviour:
|
||||
m_Url: https://package.openupm.com
|
||||
m_Scopes:
|
||||
- com.gilzoide.update-manager
|
||||
- com.github-glitchenzo.nugetforunity
|
||||
- com.yasirkula.nativegallery
|
||||
- jp.hadashikick.vcontainer
|
||||
m_IsDefault: 0
|
||||
@@ -60,7 +61,7 @@ MonoBehaviour:
|
||||
m_Modified: 0
|
||||
m_ErrorMessage:
|
||||
m_UserModificationsEntityId:
|
||||
m_Data: -946
|
||||
m_Data: -922
|
||||
m_OriginalEntityId:
|
||||
m_Data: -948
|
||||
m_Data: -926
|
||||
m_LoadAssets: 0
|
||||
|
||||
Reference in New Issue
Block a user