From ce48d715b920b0d7a6feeaffa4947f57fd29f43c Mon Sep 17 00:00:00 2001
From: "rick.mollard" <rick.mollard@nebraska.edu>
Date: Fri, 24 Jun 2022 15:33:47 -0500
Subject: [PATCH] 	modified:   README.txt

---
 README.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.txt b/README.txt
index 805a1b6..066203d 100644
--- a/README.txt
+++ b/README.txt
@@ -9,8 +9,6 @@ _________________________
 1.  Make sure you are in the correct folder where the file is located.
 2.  Update the text file for your Campus with the switches that you would like to work with.
 3.  type in "python3 flipport.py"  to run the flipport.py script.
-<<<<<<< HEAD
 4.  Enter your information and let the script run.
 =======
-4.  Enter your information and let the script run.
->>>>>>> 9393f8584d3450a0989c88b14218a2ed1ef634c5
+
-- 
GitLab