Merge conflict patch and map texture update
This commit is contained in:
@@ -6,7 +6,7 @@ EditorBuildSettings:
|
||||
serializedVersion: 2
|
||||
m_Scenes:
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/SampleScene.unity
|
||||
path: Assets/Scenes/MainScene.unity
|
||||
guid: 8afa6ce05eb7dba4c894b910786e3baf
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/Client.unity
|
||||
|
||||
Reference in New Issue
Block a user