fix conflict

PaddlePaddle · Jan 26, 2022 · d3e36c8 · d3e36c8 · paddle-bot-old · Jan 26, 2022
1 parent 6ab1421
commit d3e36c8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/paddle/pten/core/dense_tensor.cc b/paddle/pten/core/dense_tensor.cc
@@ -198,7 +198,7 @@ void DenseTensor::check_memory_size() const {
           "Tensor's dimension is out of bound."
           "Tensor's dimension must be equal or less than the size of its "
           "memory."
-          "But received Tensor's dimension is %d, memory's size is %d.",
+          "But received Tensor's dimension is d%, memory's size is %d.",
           numel() * SizeOf(dtype()),
           memory_size()));
 }