From f5ccf508c93012af95190d5d543f9ccf71c2d677 Mon Sep 17 00:00:00 2001
From: 1P-Cusack <1p-cusack@1stplayable.com>
Date: Mon, 10 Jul 2017 14:11:04 -0400
Subject: [PATCH] Fixing braces dropped in merge conflict edit.

---
 interface/resources/controllers/vive.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/resources/controllers/vive.json b/interface/resources/controllers/vive.json
index fbe65950c4..062a8787ce 100644
--- a/interface/resources/controllers/vive.json
+++ b/interface/resources/controllers/vive.json
@@ -59,8 +59,8 @@
 
         { "from": "Vive.Head", "to" : "Standard.Head"},
 
-        { "from": "Vive.RightArm", "to" : "Standard.RightArm",
-        { "from": "Vive.LeftArm", "to" : "Standard.LeftArm",
+        { "from": "Vive.RightArm", "to" : "Standard.RightArm" },
+        { "from": "Vive.LeftArm", "to" : "Standard.LeftArm" },
         { "from": "Vive.LeftThumbUp", "to": "Standard.LeftThumbUp" },
         { "from": "Vive.RightThumbUp", "to": "Standard.RightThumbUp" },
         { "from": "Vive.LeftIndexPoint", "to": "Standard.LeftIndexPoint" },