From 7610ec26931ffc6d273b189443d5529fec3afd0b Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sun, 24 Nov 2013 18:26:20 +0200 Subject: [PATCH] Fixed merging error in changeset 3912934e99ba (issue #19733). --- Lib/lib-tk/test/test_tkinter/test_widgets.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Lib/lib-tk/test/test_tkinter/test_widgets.py b/Lib/lib-tk/test/test_tkinter/test_widgets.py index 89eaa62cb9b..9c5bba81ce8 100644 --- 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')