From 34130778ecfb4628ed800c743ccdd4d6b9282fab Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Wed, 12 Dec 2018 18:41:28 -0800
Subject: [PATCH] fixing merge bug

---
 interface/src/ui/Keyboard.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/interface/src/ui/Keyboard.cpp b/interface/src/ui/Keyboard.cpp
index e66aa87e9c..9e3a3ce961 100644
--- a/interface/src/ui/Keyboard.cpp
+++ b/interface/src/ui/Keyboard.cpp
@@ -450,6 +450,8 @@ void Keyboard::setResetKeyboardPositionOnRaise(bool reset) {
             _resetKeyboardPositionOnRaise = reset;
         });
     }
+}
+
 void Keyboard::setPreferMalletsOverLasers(bool preferMalletsOverLasers) {
     _preferMalletsOverLasersSettingLock.withWriteLock([&] {
         _preferMalletsOverLasers.set(preferMalletsOverLasers);