summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-09-25 13:49:34 -0400
committerGitHub <noreply@github.com>2019-09-25 13:49:34 -0400
commit44f8d694ce5760fba5272936cfe3ab1fe48537a8 (patch)
tree59ef21892a02c9d266f5cac36872458bdbe0de61 /src/data
parent6539884c8850aca6c2057017dba9c3d78ca15784 (diff)
parent0e217e22d8fa3e075416cb332435c3756548357e (diff)
Merge pull request #86 from jiangzhengwenjz/battle
battle
Diffstat (limited to 'src/data')
-rw-r--r--src/data/items.json2
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
+}