[Python-checkins] cpython (2.7): Fixed merging error in changeset 3912934e99ba (issue #19733).

[serhiy.storchaka]

http://hg.python.org/cpython/rev/77e3e395f446
changeset:   87512:77e3e395f446
branch:      2.7
parent:      87507:30763929082c
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Nov 24 18:26:20 2013 +0200
summary:
  Fixed merging error in changeset 3912934e99ba (issue #19733).

files:
  Lib/lib-tk/test/test_tkinter/test_widgets.py |  5 -----
  1 files changed, 0 insertions(+), 5 deletions(-)


diff --git a/Lib/lib-tk/test/test_tkinter/test_widgets.py b/Lib/lib-tk/test/test_tkinter/test_widgets.py
--- a/Lib/lib-tk/test/test_tkinter/test_widgets.py
+++ b/Lib/lib-tk/test/test_tkinter/test_widgets.py
@@ -260,13 +260,8 @@
 
     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')

-- 
Repository URL: http://hg.python.org/cpython