From 54fa4365b84d3a8d6e5cf0185b4b73611c517fff Mon Sep 17 00:00:00 2001
From: Sam Gateau <samuel.gateau@gmail.com>
Date: Wed, 28 Nov 2018 22:21:58 -0800
Subject: [PATCH] FIxing build issue doh...

---
 interface/src/Application.cpp        | 6 ------
 interface/src/Application_render.cpp | 3 ---
 2 files changed, 9 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 2e46043dba..d92eae5221 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5088,13 +5088,7 @@ void Application::init() {
     // Make sure Login state is up to date
 #if !defined(DISABLE_QML)
     DependencyManager::get<DialogsManager>()->toggleLoginDialog();
-<<<<<<< HEAD
-=======
 #endif
-    if (!DISABLE_DEFERRED) {
-        DependencyManager::get<DeferredLightingEffect>()->init();
-    }
->>>>>>> f4535e6784be56de3e3b0a21517280c12a434425
     DependencyManager::get<AvatarManager>()->init();
 
     _timerStart.start();
diff --git a/interface/src/Application_render.cpp b/interface/src/Application_render.cpp
index 1e66953a49..5063f6118d 100644
--- a/interface/src/Application_render.cpp
+++ b/interface/src/Application_render.cpp
@@ -19,9 +19,6 @@
 #include "Util.h"
 
 
-
-
-<<<<<<< HEAD
 //void Application::paintGL() {
 //    // Some plugins process message events, allowing paintGL to be called reentrantly.
 //