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

7610ec26 · Serhiy Storchaka · 40dcf7f0 · 7610ec26
Commit 7610ec26 authored Nov 24, 2013 by Serhiy Storchaka
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

Lib/lib-tk/test/test_tkinter/test_widgets.py Lib/lib-tk/test/test_tkinter/test_widgets.py +0 -5

No files found.
--- 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')