From 1607c8e6e0027ce60810f43922ee6e73588015b6 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Mon, 27 Jul 2020 11:18:46 +0200
Subject: [PATCH] Fix merge issue

---
 code/Common/StandardShapes.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/Common/StandardShapes.cpp b/code/Common/StandardShapes.cpp
index b94998f1c..e745c1969 100644
--- a/code/Common/StandardShapes.cpp
+++ b/code/Common/StandardShapes.cpp
@@ -467,7 +467,6 @@ void StandardShapes::MakeCircle(ai_real radius, unsigned int tess,
     ai_real s = 1.0; // std::cos(angle == 0);
     ai_real t = 0.0; // std::sin(angle == 0);
 
-<<<<<<< HEAD
     for (ai_real angle = 0.0; angle < angle_max;) {
         positions.emplace_back(aiVector3D(s * radius, 0.0, t * radius));
         angle += angle_delta;