fix issue with manual merge conflict
This commit is contained in:
parent
2828dcaaf9
commit
80ae2bbe23
|
@ -65,7 +65,6 @@ private:
|
||||||
mutable bool _need_redraw;
|
mutable bool _need_redraw;
|
||||||
mutable double _width_correction;
|
mutable double _width_correction;
|
||||||
double _clamped_width;
|
double _clamped_width;
|
||||||
double _width_correction;
|
|
||||||
|
|
||||||
void _redraw (Cairo::RefPtr<Cairo::Context>) const;
|
void _redraw (Cairo::RefPtr<Cairo::Context>) const;
|
||||||
void _redraw (Glib::RefPtr<Pango::Context>) const;
|
void _redraw (Glib::RefPtr<Pango::Context>) const;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user