Error after rebase

2018-02-13 22:56:44 +01:00 · 2018-02-13 22:56:44 +01:00 · 6823552ee7
parent 041a1236c0
commit 6823552ee7
1 changed files with 0 additions and 1 deletions
--- 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)) {