From 1bd704ced7408b4ac886092c2c71a01232860293 Mon Sep 17 00:00:00 2001
From: Lauren Budorick <lauren@mapbox.com>
Date: Fri, 8 Aug 2014 14:04:58 -0700
Subject: [PATCH] rebase fix

---
 include/mbgl/map/tile_parser.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/mbgl/map/tile_parser.hpp b/include/mbgl/map/tile_parser.hpp
index 1b0a8bfe6..f011d47a3 100644
--- 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();