From 303fddd93b6ba503557236b4f35e3701561fc2ec Mon Sep 17 00:00:00 2001
From: stojce <stojce@me.com>
Date: Tue, 25 Feb 2014 21:19:43 +0100
Subject: [PATCH] Bad merge fix

---
 interface/src/Menu.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 5f8cc5c4dc..662f91548f 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -71,8 +71,6 @@ Menu::Menu() :
     _boundaryLevelAdjust(0),
     _maxVoxelPacketsPerSecond(DEFAULT_MAX_VOXEL_PPS),
     _lastAdjust(usecTimestampNow()),
-    _loginAction(NULL)
-    _lastAdjust(usecTimestampNow()),
     _preferencesDialog()
 {
     Application *appInstance = Application::getInstance();