fix issue with manual merge conflict
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 29 Apr 2015 12:23:13 +0000 (08:23 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 29 Apr 2015 12:23:13 +0000 (08:23 -0400)
libs/canvas/canvas/text.h

index 8e93e25c3c2656e798fba96a54683a37a1800ee0..3dfe98595562fee1719f3b9d9b42461eec1071a1 100644 (file)
@@ -65,7 +65,6 @@ private:
         mutable bool           _need_redraw;
         mutable double         _width_correction;
         double                 _clamped_width;
-        double                 _width_correction;
         
         void _redraw (Cairo::RefPtr<Cairo::Context>) const;
         void _redraw (Glib::RefPtr<Pango::Context>) const;