rebase fix

2014-08-08 14:04:58 -07:00
parent 4083b534d7
commit 1bd704ced7
1 changed files with 0 additions and 1 deletions
--- a/include/mbgl/map/tile_parser.hpp
+++ b/include/mbgl/map/tile_parser.hpp
@@ -37,7 +37,6 @@ public:
               const std::shared_ptr<GlyphStore> &glyphStore,
               const std::shared_ptr<SpriteAtlas> &spriteAtlas,
               const std::shared_ptr<Sprite> &sprite);
-               const std::shared_ptr<Texturepool> &texturepool);

 public:
    void parse();