From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 24 Nov 2013 16:26:20 +0000 (+0200)
Subject: Fixed merging error in changeset 3912934e99ba (issue #19733).
X-Git-Tag: v2.7.8~249
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7610ec26931ffc6d273b189443d5529fec3afd0b;p=python

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 89eaa62cb9..9c5bba81ce 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')