From 890ac0b2fd0297f60001f6b985ca9d55865dfff1 Mon Sep 17 00:00:00 2001
From: Stardust Sauce <stardustsauce@gmail.com>
Date: Thu, 14 Apr 2022 00:42:09 -0400
Subject: [PATCH] Corrected a minor merge error.

---
 soh/src/code/z_parameter.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 9deb8106d..a152e1b39 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -3152,7 +3152,6 @@ void Interface_Draw(GlobalContext* globalCtx) {
 
         func_80094520(globalCtx->state.gfxCtx);
 
-<<<<<<< HEAD
         if (fullUi) {
             // Rupee Icon
             Color_RGB8 rupeeColor = *(Color_RGB8*)ResourceMgr_LoadBlobByName(colorRupeeIcon);