From 795a3b8407cd9423049f9d37bf91fdf6c810bfd4 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 16 Jan 2018 19:27:35 -0800
Subject: [PATCH] Fix merge errors

---
 libraries/render-utils/src/RenderForwardTask.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/render-utils/src/RenderForwardTask.cpp b/libraries/render-utils/src/RenderForwardTask.cpp
index 498807df39..c201e8a106 100755
--- a/libraries/render-utils/src/RenderForwardTask.cpp
+++ b/libraries/render-utils/src/RenderForwardTask.cpp
@@ -169,13 +169,13 @@ void PrepareForward::run(const RenderContextPointer& renderContext, const Inputs
     gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
         args->_batch = &batch;
 
-        model::LightPointer keySunLight;
+        graphics::LightPointer keySunLight;
         auto lightStage = args->_scene->getStage<LightStage>();
         if (lightStage) {
             keySunLight = lightStage->getCurrentKeyLight();
         }
 
-        model::LightPointer keyAmbiLight;
+        graphics::LightPointer keyAmbiLight;
         if (lightStage) {
             keyAmbiLight = lightStage->getCurrentAmbientLight();
         }