fixin main like apro B)
This commit is contained in:
parent
fda7019b8f
commit
909008457b
1 changed files with 0 additions and 4 deletions
|
@ -76,8 +76,4 @@ skeleton = NodePath("../..")
|
|||
shape = SubResource("BoxShape3D_qcnmp")
|
||||
|
||||
[node name="Body" parent="World" instance=ExtResource("1_eeca8")]
|
||||
<<<<<<< HEAD
|
||||
transform = Transform3D(-0.405636, -0.914035, 0, 0.914035, -0.405636, 0, 0, 0, 1, 0, 11.4413, 0)
|
||||
=======
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 7, 0)
|
||||
>>>>>>> f16e42a8d005f3a2f44f20fa5979b49bc40d0d8b
|
||||
|
|
Loading…
Add table
Reference in a new issue