From b1767b710f807b530a3218a2c82372561fc761fa Mon Sep 17 00:00:00 2001
From: Robert Smith <robert.smith@florey.edu.au>
Date: Tue, 23 Jan 2024 11:57:51 +1100
Subject: [PATCH] mrmath: Fix conflict resolution

Merge commit e4673857 failed to address fact that modifications made in dae868ce utilised MR::vector whereas 7d81f13d merged in #2764 reverts to use of std::vector.
---
 cmd/mrmath.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/mrmath.cpp b/cmd/mrmath.cpp
index bdcf5c9aeb..eb899cb9f6 100644
--- a/cmd/mrmath.cpp
+++ b/cmd/mrmath.cpp
@@ -310,7 +310,7 @@ template <class Operation> class ImageKernel : public ImageKernelBase {
 
 protected:
   Voxel2Vector v2v;
-  vector<Operation> data;
+  std::vector<Operation> data;
 };
 
 void run() {