From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 27 Jan 2014 01:24:35 +0000 (-0500)
Subject: White space and merge cleanup.
X-Git-Tag: v3.4.0rc1~229^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76964877e3b40b79319dda095ba8ca6b50074c56;p=python

White space and merge cleanup.
---

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