Commit ed19b274 authored by Mitchie Maluschnig's avatar Mitchie Maluschnig
Browse files

Merge branch 'simonthebear' into daytime

parents 409d097d efac6456
......@@ -1447,6 +1447,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
playerNoteSpawn: {fileID: 69315318}
simonNoteSpawn: {fileID: 252927835}
playersTurn: 0
note: {fileID: 1472882270331014, guid: 926e7a0b8d8d84ab8b306dcfd69c418c, type: 2}
--- !u!4 &1447931353
Transform:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment