final changes
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta
|
||||
guid: d427f0f5ff0359f4c92a56ed37a11542
|
||||
guid: c89fd30ca0b56fb41a415d285d87b219
|
||||
========
|
||||
guid: 8f5582064724dbc45bc5c3432899f9c1
|
||||
>>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta
|
||||
|
||||
Reference in New Issue
Block a user