conflict resolved
This commit is contained in:
13
Assets/Scenes/Lobby.unity.meta
Normal file
13
Assets/Scenes/Lobby.unity.meta
Normal file
@@ -0,0 +1,13 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Materials/Green.mat.meta
|
||||
guid: 0fb69fc17dec90a41803db19eb400738
|
||||
NativeFormatImporter:
|
||||
========
|
||||
guid: a8455b5835249e44d931c30790f60381
|
||||
DefaultImporter:
|
||||
>>>>>>>> origin/main:Assets/Scenes/Lobby.unity.meta
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user