From 80ae2bbe23a35e362d31e115d4a81ba17149426a Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 29 Apr 2015 08:23:13 -0400
Subject: [PATCH] fix issue with manual merge conflict

---
 libs/canvas/canvas/text.h | 1 -
 1 file changed, 1 deletion(-)

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;