From 6823552ee7410192e81f2a8bee38773a96ff717d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Oudin?= <oudin@crans.org>
Date: Tue, 13 Feb 2018 22:56:44 +0100
Subject: [PATCH] Error after rebase

---
 Ball.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Ball.cpp b/Ball.cpp
index 1494091..fb6395c 100644
--- a/Ball.cpp
+++ b/Ball.cpp
@@ -92,7 +92,6 @@ void Ball::update_pos(double dt) {
         double old_t = T;
         double max_t;
         _compute_parameters();
->>>>>>> Utility function
         max_t = (T - old_t)/2.0 + old_t;
 
         if (((A + B * max_t - (G_CTE / 2) * max_t * max_t + min_height) < radius)) {