Permalink
Browse files

resolve merge conflict

  • Loading branch information...
1 parent d206657 commit f6f4f27b1f9b9902b6695d9ab02e54e67c043231 @artemp artemp committed Mar 12, 2012
Showing with 0 additions and 13 deletions.
  1. +0 −13 include/mapnik/symbolizer_helpers.hpp
View
13 include/mapnik/symbolizer_helpers.hpp
@@ -139,24 +139,11 @@ class shield_symbolizer_helper: public text_symbolizer_helper<FaceManagerT, Dete
unsigned width,
unsigned height,
double scale_factor,
-<<<<<<< HEAD
- CoordTransform const& t,
- FaceManagerT & font_manager,
- DetectorT & detector,
- box2d<double> const& query_extent) :
- text_symbolizer_helper<FaceManagerT, DetectorT>(sym, feature, prj_trans, width, height, scale_factor, t, font_manager, detector, query_extent),
-||||||| merged common ancestors
- CoordTransform const& t,
- FaceManagerT & font_manager,
- DetectorT & detector) :
- text_symbolizer_helper<FaceManagerT, DetectorT>(sym, feature, prj_trans, width, height, scale_factor, t, font_manager, detector),
-=======
CoordTransform const &t,
FaceManagerT &font_manager,
DetectorT &detector,
box2d<double> const& query_extent) :
text_symbolizer_helper<FaceManagerT, DetectorT>(sym, feature, prj_trans, width, height, scale_factor, t, font_manager, detector, query_extent),
->>>>>>> master
sym_(sym)
{
this->points_on_line_ = true;

0 comments on commit f6f4f27

Please sign in to comment.