resolved merge conflict

rgerkin · Feb 1, 2020 · 812920c · 812920c
1 parent 1542f59
commit 812920c
Showing 1 changed file with 1 addition and 5 deletions.
diff --git 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);