From 6fd3c9714f07747199ea8f7f9fa269f0745bee72 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Fri, 1 Nov 2013 14:37:46 -0700 Subject: [PATCH] fixed header file merge conflict --- interface/src/Application.h | 1 + interface/src/Menu.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.h b/interface/src/Application.h index 226756ab0f..4154720419 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -61,6 +61,7 @@ #include "ui/ChatEntry.h" #include "ui/VoxelStatsDialog.h" #include "ui/RearMirrorTools.h" +#include "ui/LodToolsDialog.h" class QAction; class QActionGroup; diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index ac207e8812..a1f83007fd 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -29,7 +29,6 @@ #include "Menu.h" #include "Util.h" #include "InfoView.h" -#include "ui/LodToolsDialog.h" Menu* Menu::_instance = NULL;