From 649b9aa6df6f5a77679e92cdb595b4e7f7188e32 Mon Sep 17 00:00:00 2001
From: will1742 <will1742@purdue.edu>
Date: Tue, 13 Jul 2021 10:21:41 -0400
Subject: [PATCH] Updated Readme

---
 Haas_Next_Generation/README.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Haas_Next_Generation/README.txt b/Haas_Next_Generation/README.txt
index 3bb58f8..781f23b 100644
--- a/Haas_Next_Generation/README.txt
+++ b/Haas_Next_Generation/README.txt
@@ -37,8 +37,4 @@ General notes:
 
 - Some optional portions were commented out, specifically those associated with safe start.
 
-<<<<<<< HEAD
-- Potential TODO is to remove as much halting from QA as possible
-=======
 - Macro references can be found on page 189 of the milling manual
->>>>>>> Development