diff options
| author | Lucas Shaw <lgs84@cornell.edu> | 2020-03-22 22:57:24 -0700 |
|---|---|---|
| committer | Lucas Shaw <lgs84@cornell.edu> | 2020-03-22 22:57:24 -0700 |
| commit | 6a45dcba7f382a357a016dc295beba58398079e4 (patch) | |
| tree | f6cd3be8ec3b662c5acaaeaecf0f4d8c4056d024 /src/libultra_code/code_80106760.c | |
| parent | 62e7a8c0376666f7ab8ca49e44eb831d6232d61e (diff) | |
| parent | d879f2acb02924b75552487db291fa3e0397d86c (diff) | |
Fixed merge conflict
Diffstat (limited to 'src/libultra_code/code_80106760.c')
| -rw-r--r-- | src/libultra_code/code_80106760.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libultra_code/code_80106760.c b/src/libultra_code/code_80106760.c index e6626dfb3..e9f44fd63 100644 --- a/src/libultra_code/code_80106760.c +++ b/src/libultra_code/code_80106760.c @@ -1,8 +1,7 @@ #include <ultra64.h> #include <global.h> -u32* func_80106760() -{ +u32* func_80106760() { register u32 sMask = __osDisableInt(); u32* var1; |