0606b1936d
(cherry picked from commit 0cc9ddba16)
# Conflicts:
# 3d Prototyp/Assets/Models/Consumables/Bottle.meta
# 3d Prototyp/Assets/Scenes/GameJamScene.unity
13 lines
369 B
Plaintext
13 lines
369 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<<< HEAD:3d Prototyp/Assets/Animations.meta
|
|
guid: 4e1e71220c1155642be0e1fb57d1a0b5
|
|
========
|
|
guid: b5a1bf502fb00de4da1ab0b10ff7ca3f
|
|
>>>>>>>> 561a11e6d01bf2df9669da9e53bbf93264bb5dcb:3d Prototyp/Assets/Models/Consumables/Bottle.meta
|
|
folderAsset: yes
|
|
DefaultImporter:
|
|
externalObjects: {}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|