From 84b8e7c2562cb9753ce83c6039e765116c3578b5 Mon Sep 17 00:00:00 2001 From: Ben Chauvette Date: Thu, 11 Feb 2016 22:36:39 -0500 Subject: [PATCH 1/2] Fix leftover merge conflict from stash --- data/v2/__init__.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/v2/__init__.py b/data/v2/__init__.py index 5aeb0d50..fa3d5768 100644 --- a/data/v2/__init__.py +++ b/data/v2/__init__.py @@ -1,5 +1 @@ -<<<<<<< Updated upstream -from .build import * -======= from build import * ->>>>>>> Stashed changes From 5587ebd9acfd7d8dc31aab1ee7343df4112f29ee Mon Sep 17 00:00:00 2001 From: PoroCYon Date: Fri, 12 Feb 2016 12:46:02 +0100 Subject: [PATCH 2/2] Fixed typos in README (fixes #97) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I've left `pokédexes` as it is. --- pokemon_v2/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pokemon_v2/README.md b/pokemon_v2/README.md index 40753d42..67347f6f 100644 --- a/pokemon_v2/README.md +++ b/pokemon_v2/README.md @@ -2232,7 +2232,7 @@ Pokeathlon Stats are different attributes of a pokemons performance in pokeathlo ## Pokemon -Pokemon are the creatures that inhabit the world of the pokemon games. They can be caught using pokeball's and trained by battling with other pokemon. See [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Pokémon_(species)) for greater detail. +Pokemon are the creatures that inhabit the world of the pokemon games. They can be caught using pokeballs and trained by battling with other pokemon. See [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Pokémon_(species)) for greater detail. ### GET api/v2/pokemon/{id or name} @@ -2362,8 +2362,8 @@ Pokemon are the creatures that inhabit the world of the pokemon games. They can | game_indices | A list of game indices relevent to pokemon item by generation | list [VersionGameIndex](#versiongameindex) | | held_items | A list of items this pokemon may be holding when encountered | list [NamedAPIResource](#namedapiresource) ([Item](#items)) | | location_area_encounters | A list of location areas as well as encounter details pertaining to specific versions | list [LocationAreaEncounter](#locationareaencounter) | -| moves | A list of moves along with learn methods and level details pertaining to specific version groups | [NamedAPIResource](#namedapiresource) (Move](#moves)) | -| species | The species this pokemon belongs to | [NamedAPIResource](#namedapiresource) (PokemonSpecies](#pokemon-species)) | +| moves | A list of moves along with learn methods and level details pertaining to specific version groups | [NamedAPIResource](#namedapiresource) ([Move](#moves)) | +| species | The species this pokemon belongs to | [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) | | stats | A list of base stat values for this pokemon | list [NamedAPIResource](#namedapiresource) ([Stat](#stats)) | | types | A list of details showing types this pokemon has | list [PokemonType](#pokemontype) |