diff options
| author | shawlucas <lgs84@cornell.edu> | 2020-03-21 18:13:55 -0700 |
|---|---|---|
| committer | shawlucas <lgs84@cornell.edu> | 2020-03-21 18:14:17 -0700 |
| commit | 08b73fe68558c041d332ae330a06bee7f052c68b (patch) | |
| tree | 4de9435b02ab20ec289058acf94596f4aaaab63b /src/code/code_8007BF10.c | |
| parent | fd2dae78a2f90af23a834f77bab7dfff2e05f5d6 (diff) | |
| parent | 1d79f4b93d77f7f52c805c2b8a04975e63cc3aaa (diff) | |
fixed merge conflict
Diffstat (limited to 'src/code/code_8007BF10.c')
| -rw-r--r-- | src/code/code_8007BF10.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/code/code_8007BF10.c b/src/code/code_8007BF10.c deleted file mode 100644 index 46771a303..000000000 --- a/src/code/code_8007BF10.c +++ /dev/null @@ -1,5 +0,0 @@ -#include <ultra64.h> -#include <global.h> - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_8007BF10/func_8007BF10.s") - |