Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 15:20:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing braces dropped in merge conflict edit.

Browse source
This commit is contained in:
1P-Cusack 2017-07-10 14:11:04 -04:00
parent 2cafefaff8
commit f5ccf508c9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/controllers/vive.json
View file

@ -59,8 +59,8 @@
{ "from": "Vive.Head", "to" : "Standard.Head"}, { "from": "Vive.Head", "to" : "Standard.Head"},
{ "from": "Vive.RightArm", "to" : "Standard.RightArm", { "from": "Vive.RightArm", "to" : "Standard.RightArm" },
{ "from": "Vive.LeftArm", "to" : "Standard.LeftArm", { "from": "Vive.LeftArm", "to" : "Standard.LeftArm" },
{ "from": "Vive.LeftThumbUp", "to": "Standard.LeftThumbUp" }, { "from": "Vive.LeftThumbUp", "to": "Standard.LeftThumbUp" },
{ "from": "Vive.RightThumbUp", "to": "Standard.RightThumbUp" }, { "from": "Vive.RightThumbUp", "to": "Standard.RightThumbUp" },
{ "from": "Vive.LeftIndexPoint", "to": "Standard.LeftIndexPoint" }, { "from": "Vive.LeftIndexPoint", "to": "Standard.LeftIndexPoint" },