diff options
| author | Eric Mariasis <ericmariasis829@gmail.com> | 2020-02-01 13:37:56 -0500 |
|---|---|---|
| committer | Eric Mariasis <ericmariasis829@gmail.com> | 2020-02-01 13:37:56 -0500 |
| commit | 812920c0cc3098289a105f40371814512fc6157d (patch) | |
| tree | 175f799b39c25dbe413004d4c6a9e94013ef0ef9 /numpy/core/src | |
| parent | 1542f59575a9400691cb1a63de3bcdb5265d3e4b (diff) | |
| download | numpy-812920c0cc3098289a105f40371814512fc6157d.tar.gz | |
resolved merge conflict
Diffstat (limited to 'numpy/core/src')
| -rw-r--r-- | numpy/core/src/multiarray/descriptor.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c index e7ed37111..5182a28dd 100644 --- a/numpy/core/src/multiarray/descriptor.c +++ b/numpy/core/src/multiarray/descriptor.c @@ -242,13 +242,9 @@ static PyArray_Descr * _convert_from_tuple(PyObject *obj, int align) { if (PyTuple_GET_SIZE(obj) != 2) { -<<<<<<< HEAD PyErr_Format(PyExc_TypeError, - "Tuple must have size 2, but has size %d", + "Tuple must have size 2, but has size %zd", PyTuple_GET_SIZE(obj)); -======= - PyErr_Format(PyExc_TypeError, "Tuple must have size 2, but has size %zd", PyTuple_GET_SIZE(obj)); ->>>>>>> 303ce30f051070bc73307296faf02bdf7eb00fc5 return NULL; } PyArray_Descr *type = _convert_from_any(PyTuple_GET_ITEM(obj, 0), align); |