From fb8a48c5d082f4cc55efdf1966a3a1d3c3534a14 Mon Sep 17 00:00:00 2001
From: Jeklah <arthurbowers@gmail.com>
Date: Sat, 14 Nov 2020 13:32:45 +0000
Subject: [PATCH] Removing header markers

---
 scripts/ships.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/scripts/ships.py b/scripts/ships.py
index 3205428..5b391b3 100644
--- a/scripts/ships.py
+++ b/scripts/ships.py
@@ -19,11 +19,7 @@
 shipParts = []      # Initialising the list.
 
 def welcome():
-<<<<<<< HEAD
-#    os.system('clear')
-=======
     # os.system('clear')
->>>>>>> 63c36cce5bb71db895285bd34e830574a2552aa2
     click.echo('             Hello and Welcome to Jeklah\'s Ship Cost Calculator' + '\n')
     click.echo('*** DISCLAIMER *** This tool assumes 10/20 research on bps...for now. *** DISCLAIMER ***')
 
@@ -38,11 +34,7 @@ def choose_market():
     return(marketName)
 
 def choose_ship():
-<<<<<<< HEAD
-#    os.system('clear')
-=======
     # os.system('clear')
->>>>>>> 63c36cce5bb71db895285bd34e830574a2552aa2
     click.echo('                              Ship Choice')
     click.echo('                 Please choose which ship you would like')
     for ship in shipList: