resolved issues and added minigames to list
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Materials/Blue.mat.meta
|
||||
guid: 151c2d5ead486e14f84805c05457ef7f
|
||||
guid: 35493988850f6fe489b4be5b2f625f95
|
||||
========
|
||||
guid: 0ac383cb888b6814d8432e6ec14f49cd
|
||||
>>>>>>>> origin/main:Assets/Materials/image.mat.meta
|
||||
|
||||
Reference in New Issue
Block a user