From 29d4316c8385c64b3ab940261ebf9cd33459b480 Mon Sep 17 00:00:00 2001
From: BenCat07 <BenCat07@gmail.com>
Date: Wed, 18 Jul 2018 22:15:00 +0200
Subject: [PATCH] Fix merge conflicts

---
 src/hacks/Backtrack.cpp |  5 -----
 src/hacks/FollowBot.cpp | 20 --------------------
 2 files changed, 25 deletions(-)

diff --git a/src/hacks/Backtrack.cpp b/src/hacks/Backtrack.cpp
index 2c703fdb..66ee5215 100644
--- a/src/hacks/Backtrack.cpp
+++ b/src/hacks/Backtrack.cpp
@@ -161,13 +161,8 @@ void Run()
         float bestFOV = 180.0f;
         float distance, prev_distance_ticks = 9999;
 
-<<<<<<< Updated upstream
         for (int i = 0; i < 12; ++i)
             sorted_ticks[i] = BestTickData{INT_MAX, i};
-=======
-        for (int i          = 0; i < 12; ++i)
-            sorted_ticks[i] = BestTickData{ FLT_MAX, i };
->>>>>>> Stashed changes
         for (int t = 0; t < ticks; ++t)
         {
             if (headPositions[iBestTarget][t].tickcount)
diff --git a/src/hacks/FollowBot.cpp b/src/hacks/FollowBot.cpp
index e38f7748..731d5b0f 100644
--- a/src/hacks/FollowBot.cpp
+++ b/src/hacks/FollowBot.cpp
@@ -203,15 +203,7 @@ void WorldTick()
                                         // future target is visible from
                 if (!indirectOrigin.z) // if we couldn't find it, exit
                     continue;
-<<<<<<< Updated upstream
                 addCrumbs(entity, indirectOrigin);
-=======
-                breadcrumbs.clear(); // we need to ensure that the breadcrumbs
-                                     // std::vector is empty
-                breadcrumbs.push_back(indirectOrigin); // add the corner
-                                                       // location to the
-                                                       // breadcrumb list
->>>>>>> Stashed changes
             }
             else
             {
@@ -295,18 +287,6 @@ void WorldTick()
                 if (!VisCheckEntFromEnt(LOCAL_E, entity))
                     continue;
             }
-<<<<<<< Updated upstream
-=======
-            // favor closer entitys
-            if (follow_target &&
-                ENTITY(follow_target)->m_flDistance() >
-                    entity->m_flDistance()) // favor closer entitys
-            {
-                if (ClassPriority(ENTITY(follow_target)) >
-                    ClassPriority(entity))
-                    continue;
-            }
->>>>>>> Stashed changes
 
             // ooooo, a target
             follow_target = i;