From d8dad5b86f392a332129114b6e1f58dd66491c99 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 26 Jun 2015 17:17:56 -0700
Subject: [PATCH] Fixing bad merge

---
 interface/src/Menu.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 71f858f551..731d01d549 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -199,7 +199,6 @@ namespace MenuOption {
     const QString FrameTimer = "Show Timer";
     const QString FullscreenMirror = "Fullscreen Mirror";
     const QString GlowWhenSpeaking = "Glow When Speaking";
-    const QString NamesAboveHeads = "Names Above Heads";
     const QString IncreaseAvatarSize = "Increase Avatar Size";
     const QString IndependentMode = "Independent Mode";
     const QString KeyboardMotorControl = "Enable Keyboard Motor Control";