From 52f756a03ff9f9040011905594eecb31c40886a9 Mon Sep 17 00:00:00 2001
From: Brian Peiris <brianpeiris@gmail.com>
Date: Fri, 2 Nov 2018 16:58:35 -0700
Subject: [PATCH] Fix bad merge
---
src/hub.html | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/hub.html b/src/hub.html
index 62d8b2c5e..a4eff0a00 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -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>
--
GitLab