Commit dcc6d32e authored by Thomas Wouters's avatar Thomas Wouters

Fix merge glitch.

parent 3fc2ca38
...@@ -511,7 +511,7 @@ class DecimalImplicitConstructionTest(unittest.TestCase): ...@@ -511,7 +511,7 @@ class DecimalImplicitConstructionTest(unittest.TestCase):
('+', '__add__', '__radd__'), ('+', '__add__', '__radd__'),
('-', '__sub__', '__rsub__'), ('-', '__sub__', '__rsub__'),
('*', '__mul__', '__rmul__'), ('*', '__mul__', '__rmul__'),
('/', '__truediv__', '__rtruediv__') ('/', '__truediv__', '__rtruediv__'),
('%', '__mod__', '__rmod__'), ('%', '__mod__', '__rmod__'),
('//', '__floordiv__', '__rfloordiv__'), ('//', '__floordiv__', '__rfloordiv__'),
('**', '__pow__', '__rpow__') ('**', '__pow__', '__rpow__')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment