Skip to content

Commit d18cf28

Browse files
committed
updates for float format
2 parents 06b55dc + 1b612f0 commit d18cf28

File tree

2 files changed

+0
-36
lines changed

2 files changed

+0
-36
lines changed

pandas/io/formats/html.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,7 @@ def _write_cell(
190190

191191
if self.escape:
192192
# escape & first to prevent double escaping of &
193-
<<<<<<< Updated upstream
194-
esc = {"&": r"&amp;", "<": r"&lt;", ">": r"&gt;"," ":"&nbsp;"}
195-
=======
196193
esc = {"&": r"&amp;", "<": r"&lt;", ">": r"&gt;"}
197-
>>>>>>> Stashed changes
198194
else:
199195
esc = {}
200196

pandas/tests/io/test_info_repr_html.py

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)