Fixed merge conflict

1 files changed, 7 insertions, 8 deletions

diff --git a/src/libultra_boot_O2/sprintf.c b/src/libultra_boot_O2/sprintf.c
index 58510a35c..2ff0b33e0 100644
--- a/src/libultra_boot_O2/sprintf.c
+++ b/src/libultra_boot_O2/sprintf.c
@@ -1,26 +1,25 @@
 #include <global.h>
 
-char* proutSprintf(char* dst, const char *fmt, size_t size)
-{
+char* proutSprintf(char* dst, const char* fmt, size_t size) {
     return (char*)memcpy(dst, fmt, size) + size;
 }
 
-s32 vsprintf(char* dst, const char* fmt, va_list args)
-{
+s32 vsprintf(char* dst, const char* fmt, va_list args) {
     s32 ret = _Printf(&proutSprintf, dst, fmt, args);
-    if (ret > -1)
+    if (ret > -1) {
         dst[ret] = 0;
+    }
     return ret;
 }
 
-s32 sprintf(char* dst, const char* fmt, ...)
-{
+s32 sprintf(char* dst, const char* fmt, ...) {
     s32 ret;
     va_list args;
     va_start(args, fmt);
 
     ret = _Printf(&proutSprintf, dst, fmt, args);
-    if (ret > -1)
+    if (ret > -1) {
         dst[ret] = 0;
+    }
     return ret;
 }