resolved issues and added minigames to list
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Scenes/ButtonsMemoryMinigame.unity.meta
|
||||
guid: 5f8ea27ba7c86044e9192a63e6e3b6db
|
||||
guid: a25fb175a69711142ad29b45ee525020
|
||||
========
|
||||
guid: 99349b837685d91408e5eb5bac237678
|
||||
>>>>>>>> origin/main:Assets/Scenes/Client.unity.meta
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Materials/Green.mat.meta
|
||||
guid: 0fb69fc17dec90a41803db19eb400738
|
||||
guid: 2c6b0099075291549ac7194c83d1e61e
|
||||
NativeFormatImporter:
|
||||
========
|
||||
guid: a8455b5835249e44d931c30790f60381
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1be8570b1bc20d946a6e92f218d0de7d
|
||||
guid: 900bc523907f8ee48baf5515a54e6716
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
@@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Materials/Magenta.mat.meta
|
||||
guid: f5b74b605e2aedd42a9e4e8a40046cf5
|
||||
guid: fb3371dc09f50d14990c4fd40a2862b6
|
||||
NativeFormatImporter:
|
||||
========
|
||||
guid: 070c4a89027b6e9a28e16859d55f8c66
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user