From 7a9f469dca9b1e61783f015bb6eb734ec72a126a Mon Sep 17 00:00:00 2001
From: einstein95 <einstein95@users.noreply.github.com>
Date: Wed, 20 Jul 2016 01:42:55 +1200
Subject: Whoops x2

---
 engine/hidden_object_functions17.asm | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'engine')

diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm
index 4b159ab4..dbbb5513 100755
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -150,19 +150,11 @@ LinkCableHelpText2:
 	TX_FAR _LinkCableHelpText2
 	db "@"
 
-<<<<<<< HEAD
 HowToLinkText:
-	db   "HOW TO LINK"
-	next "COLOSSEUM"
-	next "TRADE CENTER"
-	next "STOP READING@"
-=======
-HowToLinkText: ; 5dca8 (17:5ca8)
 	db   "CABLE LINK"
 	next "COLISEE"
 	next "CENTRE TROC"
 	next "NE PLUS LIRE@"
->>>>>>> 6c2df7c2aea94b0e5a5532293aae9a25d64a8050
 
 LinkCableInfoTexts:
 	dw LinkCableInfoText1
-- 
cgit v1.2.3