Fixed merging error in changeset 3912934e99ba (issue #19733).

diff --git a/Lib/lib-tk/test/test_tkinter/test_widgets.py b/Lib/lib-tk/test/test_tkinter/test_widgets.py
index 89eaa62cb9b745c16c31547ac9111bbb337af768..9c5bba81ce8dc874ff2da7fed09a3e8e185bdf2a 100644 (file)
--- a/Lib/lib-tk/test/test_tkinter/test_widgets.py
+++ b/Lib/lib-tk/test/test_tkinter/test_widgets.py
@@ -260,13 +260,8 @@ class MenubuttonTest(AbstractLabelTest, unittest.TestCase):
 
     test_highlightthickness = StandardOptionsTests.test_highlightthickness.im_func
 
-<<<<<<<
-=======
-    test_highlightthickness = StandardOptionsTests.test_highlightthickness
-
     @unittest.skipIf(sys.platform == 'darwin',
                      'crashes with Cocoa Tk (issue19733)')
->>>>>>>
     def test_image(self):
         widget = self.create()
         image = Tkinter.PhotoImage('image1')