From e8fafeb6015d507b2e37778563b718df61ce54d9 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 31 Jul 2015 16:17:32 -0700
Subject: [PATCH] Fixing merge conflict

---
 tests/render-utils/src/main.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/render-utils/src/main.cpp b/tests/render-utils/src/main.cpp
index c4bb05ed5d..d9ca50f61e 100644
--- a/tests/render-utils/src/main.cpp
+++ b/tests/render-utils/src/main.cpp
@@ -252,7 +252,6 @@ void QTestWindow::draw() {
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glViewport(0, 0, _size.width() * devicePixelRatio(), _size.height() * devicePixelRatio());
 
-<<<<<<< HEAD
     static std::once_flag once;
     std::call_once(once, [&]{
         testShaderBuild(Skybox_vert, Skybox_frag);
@@ -293,8 +292,6 @@ void QTestWindow::draw() {
     });
     //    renderText();
 
-=======
->>>>>>> master
     _context->swapBuffers(this);
     glFinish();