From 4a4b4835321f7c710e23da9486e0627f9c1ba257 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Tue, 14 Jan 2014 10:31:47 -0600 Subject: [PATCH] Resolving conflicts --- interface/src/Application.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 6bb54e7d95..d50b8962a9 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -89,12 +89,8 @@ const float MIRROR_FULLSCREEN_DISTANCE = 0.35f; const float MIRROR_REARVIEW_DISTANCE = 0.65f; const float MIRROR_REARVIEW_BODY_DISTANCE = 2.3f; -<<<<<<< HEAD const QString CHECK_VERSION_URL = "http://www.google.com"; - -======= ->>>>>>> a8bbe41642f5ce3152f7e7ca8b9b001c78c2fcdc void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString &message) { fprintf(stdout, "%s", message.toLocal8Bit().constData()); Application::getInstance()->getLogger()->addMessage(message.toLocal8Bit().constData());