github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-21 05:43:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Corrected a minor merge error.

Browse source
This commit is contained in:
Stardust Sauce 2022-04-14 00:42:09 -04:00
commit 890ac0b2fd
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
soh/src/code/z_parameter.c
View file

@ -3152,7 +3152,6 @@ void Interface_Draw(GlobalContext* globalCtx) {
func_80094520(globalCtx->state.gfxCtx); func_80094520(globalCtx->state.gfxCtx);
<<<<<<< HEAD
if (fullUi) { if (fullUi) {
// Rupee Icon // Rupee Icon
Color_RGB8 rupeeColor = *(Color_RGB8*)ResourceMgr_LoadBlobByName(colorRupeeIcon); Color_RGB8 rupeeColor = *(Color_RGB8*)ResourceMgr_LoadBlobByName(colorRupeeIcon);