From 3dbbef9d7693ef444184ca59115f1908fbee1dd9 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sun, 17 Nov 2013 12:49:28 +0200 Subject: [PATCH] Fix merge error in issue #19602. --- Lib/lib-tk/test/test_ttk/test_extensions.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Lib/lib-tk/test/test_ttk/test_extensions.py b/Lib/lib-tk/test/test_ttk/test_extensions.py index 1d8c4235cd..110249d635 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): -- 2.50.1