diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-04-29 08:23:13 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-04-29 08:23:13 -0400 |
| commit | 80ae2bbe23a35e362d31e115d4a81ba17149426a (patch) | |
| tree | 515c069b8b04bbfc383ca7f22f1d3c17267bfa81 /libs | |
| parent | 2828dcaaf9e1c56fb66df09e0994a5bdc8121658 (diff) | |
fix issue with manual merge conflict
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/canvas/canvas/text.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/canvas/canvas/text.h b/libs/canvas/canvas/text.h index 8e93e25c3c..3dfe985955 100644 --- a/libs/canvas/canvas/text.h +++ b/libs/canvas/canvas/text.h @@ -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; |