From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 17 Nov 2013 10:49:28 +0000 (+0200)
Subject: Fix merge error in issue #19602.
X-Git-Tag: v2.7.8~270
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3dbbef9d7693ef444184ca59115f1908fbee1dd9;p=thirdparty%2FPython%2Fcpython.git

Fix merge error in issue #19602.
---

diff --git a/Lib/lib-tk/test/test_ttk/test_extensions.py b/Lib/lib-tk/test/test_ttk/test_extensions.py
index 1d8c4235cd0e..110249d6356f 100644
--- a/Lib/lib-tk/test/test_ttk/test_extensions.py
+++ b/Lib/lib-tk/test/test_ttk/test_extensions.py
@@ -45,11 +45,7 @@ class LabeledScaleTest(unittest.TestCase):
         # it tries calling instance attributes not yet defined.
         ttk.LabeledScale(variable=myvar)
         if hasattr(sys, 'last_type'):
-<<<<<<<
-            self.assertFalse(sys.last_type == Tkinter.TclError)
-=======
             self.assertNotEqual(sys.last_type, tkinter.TclError)
->>>>>>>
 
 
     def test_initialization(self):