resolve conflict

2012-03-09 13:33:16 +00:00 · 2012-03-09 13:33:16 +00:00 · a763d03110
commit a763d03110
parent 961ab51aef
1 changed files with 1 additions and 1 deletions
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@ -132,7 +132,7 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
                clipped_geometry_type clipped(geom);
                clipped.clip_box(ext.minx(),ext.miny(),ext.maxx(),ext.maxy());
                path_type path(t_,clipped,prj_trans);
-
+                
                if (stroke_.has_dash())
                {
                    agg::conv_dash<path_type> dash(path);