veekun_pokedex/pokedex/data/csv/generations.csv

id,main_region_id,identifier
1,1,generation-i
2,2,generation-ii
3,3,generation-iii
4,4,generation-iv
5,5,generation-v
6,6,generation-vi
7,7,sun-moon
Drop Generation.canonical_pokedex. Generation VI doesn't have a canonical pokedex (it has three). We don't use this anywhere and as far as i can tell we never have. We can revive it in another form if and when we find we need it. Conflicts: pokedex/data/csv/generations.csv pokedex/db/tables.py 2013-10-19 00:49:41 +00:00			`id,main_region_id,identifier`
			`1,1,generation-i`
			`2,2,generation-ii`
			`3,3,generation-iii`
			`4,4,generation-iv`
			`5,5,generation-v`
			`6,6,generation-vi`
Add Sun/Moon 2017-01-27 00:32:12 +00:00			`7,7,sun-moon`