# Conflicts:
#	Assets/MotionNotes/Clap.cs
#	Assets/MotionNotes/Guard.cs
#	Assets/MotionNotes/HandDown.cs.meta
#	Assets/MotionNotes/Jump.cs
#	Assets/MotionNotes/PushUp.cs
#	Assets/Script/MotionNote.cs