Merge branch 'master' into empty_lines

This commit is contained in:
maleclercq 2020-12-03 09:56:36 +01:00 committed by GitHub
commit 31d6c1add5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2074,7 +2074,7 @@ pokemon_id,ability_id,is_hidden,slot
863,181,0,2
863,252,1,3
864,133,0,1
864,130,1,3
864,253,1,3
865,80,0,1
865,113,1,3
866,77,0,1
@ -2137,7 +2137,7 @@ pokemon_id,ability_id,is_hidden,slot
895,263,0,1
896,264,0,1
897,265,0,1
898,46,0,1
898,127,0,1
10001,46,0,1
10002,46,0,1
10003,46,0,1

1 pokemon_id ability_id is_hidden slot
2074 863 181 0 2
2075 863 252 1 3
2076 864 133 0 1
2077 864 130 253 1 3
2078 865 80 0 1
2079 865 113 1 3
2080 866 77 0 1
2137 895 263 0 1
2138 896 264 0 1
2139 897 265 0 1
2140 898 46 127 0 1
2141 10001 46 0 1
2142 10002 46 0 1
2143 10003 46 0 1