Skip to content
Snippets Groups Projects
Commit 52f756a0 authored by Brian Peiris's avatar Brian Peiris
Browse files

Fix bad merge

parent 8733b32d
No related branches found
No related tags found
No related merge requests found
......@@ -431,6 +431,10 @@
</a-entity>
</template>
<template data-name="Head">
<a-entity id="player-head" visible="false" bone-visibility></a-entity>
</template>
<template data-name="LeftHand">
<a-entity bone-visibility hover-visuals="hand: left; controller: #player-left-controller"></a-entity>
</template>
......@@ -439,9 +443,6 @@
<a-entity bone-visibility hover-visuals="hand: right; controller: #player-right-controller"></a-entity>
</template>
<template data-name="RightHand">
<a-entity bone-visibility></a-entity>
</template>
</a-entity>
</a-entity>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment