From 76964877e3b40b79319dda095ba8ca6b50074c56 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Sun, 26 Jan 2014 20:24:35 -0500 Subject: [PATCH] White space and merge cleanup. --- Lib/idlelib/idle_test/test_calltips.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Lib/idlelib/idle_test/test_calltips.py b/Lib/idlelib/idle_test/test_calltips.py index 8edaf6b1ef..4bf5e7e5dc 100644 --- a/Lib/idlelib/idle_test/test_calltips.py +++ b/Lib/idlelib/idle_test/test_calltips.py @@ -69,12 +69,8 @@ class Get_signatureTest(unittest.TestCase): self.assertEqual(signature(textwrap.TextWrapper), '''\ (width=70, initial_indent='', subsequent_indent='', expand_tabs=True, replace_whitespace=True, fix_sentence_endings=False, break_long_words=True, -<<<<<<< local drop_whitespace=True, break_on_hyphens=True, tabsize=8, *, max_lines=None, placeholder=' [...]')''') -======= - drop_whitespace=True, break_on_hyphens=True, tabsize=8)''') ->>>>>>> other def test_docline_truncation(self): def f(): pass -- 2.40.0