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 1d8c4235cd0e943d8bedf9dcbe435f227b4b367a..110249d6356ff8e0a194f0d7eac5d1c8e386cfef 100644 (file)
--- 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):