White space and merge cleanup.

diff --git a/Lib/idlelib/idle_test/test_calltips.py b/Lib/idlelib/idle_test/test_calltips.py
index 8edaf6b1ef60a4da17cf3d2633ac9d7bd3400fc4..4bf5e7e5dc20e48b5cb8d02a0c4fd6090ee948f2 100644 (file)
--- 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