From 07eee1cdf9eedc2be10362c63057005883ecdb90 Mon Sep 17 00:00:00 2001
From: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Date: Sat, 27 Mar 2021 09:20:29 +0000
Subject: [PATCH] Fix rebase mistakes

---
 src/openrct2/localisation/StringIds.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h
index fb6c03b27f..ad79e909a4 100644
--- a/src/openrct2/localisation/StringIds.h
+++ b/src/openrct2/localisation/StringIds.h
@@ -3900,7 +3900,6 @@ enum
     STR_INSTALL_INNOEXTRACT = 6408,
     STR_NOT_THE_GOG_INSTALLER = 6409,
 
-<<<<<<< HEAD
     STR_ZOOM_BUTTON_ON_TOOLBAR = 6410,
     STR_ZOOM_BUTTON_ON_TOOLBAR_TIP = 6411,