diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-12-05 12:42:30 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-12-05 12:42:30 -0600 |
| commit | 19fbf024ff7e5bedc0f297a44c7df298a9bd0ef4 (patch) | |
| tree | e9a928ac0d8eaaca476d8704b95fbf5f6838d994 /src/berry.c | |
| parent | caa13f877797edbb7a1e13bf00b537bafbd4315a (diff) | |
| parent | 00896cb3b5813cb843e5e1abd4cbc9ff0ad3a632 (diff) | |
fix merge conflicts
Diffstat (limited to 'src/berry.c')
| -rw-r--r-- | src/berry.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/berry.c b/src/berry.c index 8522ca9c7..74b7090c0 100644 --- a/src/berry.c +++ b/src/berry.c @@ -4,7 +4,7 @@ #include "item.h" #include "constants/items.h" #include "text.h" -#include "rng.h" +#include "random.h" #include "event_data.h" #include "fieldmap.h" |