From 4d9983a867418bdfe667cb8602dcede1691a32fa Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Wed, 1 Feb 2023 14:57:31 +0100
Subject: [PATCH] Solve 1 more conflict

---
 modules/base/rendering/renderablemodel.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 1796b72e1f..772b7dcc9b 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -65,7 +65,6 @@ namespace {
         { "Color Adding", ColorAddingBlending }
     };
 
-<<<<<<< HEAD
     const GLenum ColorAttachmentArray[3] = {
        GL_COLOR_ATTACHMENT0,
        GL_COLOR_ATTACHMENT1,
@@ -80,10 +79,6 @@ namespace {
 
     constexpr std::array<const char*, 11> UniformNames = {
         "nLightSources", "lightDirectionsViewSpace", "lightIntensities",
-=======
-    constexpr std::array<const char*, 12> UniformNames = {
-        "opacity", "nLightSources", "lightDirectionsViewSpace", "lightIntensities",
->>>>>>> master
         "modelViewTransform", "normalTransform", "projectionTransform",
         "performShading", "ambientIntensity", "diffuseIntensity",
         "specularIntensity", "gBufferDepthTexture"