diff options
author | SatoMew <SatoMew@users.noreply.github.com> | 2019-10-08 22:46:32 +0100 |
---|---|---|
committer | SatoMew <SatoMew@users.noreply.github.com> | 2019-10-08 22:46:32 +0100 |
commit | 2c254082de042dde46cee9d2da2d9bb1bc340905 (patch) | |
tree | af99bcac2c6fece9523b12dbabe4128ec26f6fc9 /src/data | |
parent | 78558b07b0983b6b8b06085933fdf66b801658e9 (diff) | |
parent | 2a7205dec677c98d087cb8ba191370de464c8bf0 (diff) |
Merge branch 'master' of https://github.com/pret/pokefirered
Diffstat (limited to 'src/data')
-rw-r--r-- | src/data/items.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/data/items.json b/src/data/items.json index b976e4c3e..48d614a80 100644 --- a/src/data/items.json +++ b/src/data/items.json @@ -6059,4 +6059,4 @@ "secondaryId": 0 } ] -}
\ No newline at end of file +} |