Fixed merge conflict

1 files changed, 4 insertions, 8 deletions

diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c
index 0bd169090..f23c7239a 100644
--- a/src/code/sys_ucode.c
+++ b/src/code/sys_ucode.c
@@ -1,21 +1,17 @@
 #include <global.h>
 
-u32 SysUcode_GetUCodeBoot()
-{
+u32 SysUcode_GetUCodeBoot() {
     return &D_80009320;
 }
 
-u32 SysUcode_GetUcodeBootSize()
-{
+u32 SysUcode_GetUcodeBootSize() {
     return (u32)&D_800093F0 - (u32)&D_80009320;
 }
 
-u32 SysUcode_GetUcode()
-{
+u32 SysUcode_GetUcode() {
     return D_8012DBA0;
 }
 
-u32 SysUcode_GetUcodeData()
-{
+u32 SysUcode_GetUcodeData() {
     return D_8012DBA4;
 }