Fixed merge conflict

1 files changed, 4 insertions, 8 deletions

diff --git a/src/code/code_80069420.c b/src/code/code_80069420.c
index f0be5b4c3..ee9a179d7 100644
--- a/src/code/code_80069420.c
+++ b/src/code/code_80069420.c
@@ -1,13 +1,11 @@
 #include <ultra64.h>
 #include <global.h>
 
-void* MemCopy(void* dest, void* src, s32 size)
-{
+void* MemCopy(void* dest, void* src, s32 size) {
     u8* destu = (u8*)dest;
     u8* srcu = (u8*)src;
 
-    while (size > 0)
-    {
+    while (size > 0) {
         *destu++ = *srcu++;
         size--;
     }
@@ -15,13 +13,11 @@ void* MemCopy(void* dest, void* src, s32 size)
     return dest;
 }
 
-void* MemSet(void* dest, s32 val, s32 size)
-{
+void* MemSet(void* dest, s32 val, s32 size) {
     u8* destu = (u8*)dest;
     s32 s = size;
 
-    while (s > 0)
-    {
+    while (s > 0) {
         *destu++ = val;
         s--;
     }