Skip to content

Commit

Permalink
mrmath: Fix conflict resolution
Browse files Browse the repository at this point in the history
Merge commit e467385 failed to address fact that modifications made in dae868c utilised MR::vector whereas 7d81f13 merged in #2764 reverts to use of std::vector.
  • Loading branch information
Lestropie committed Jan 23, 2024
1 parent e467385 commit b1767b7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cmd/mrmath.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ template <class Operation> class ImageKernel : public ImageKernelBase {

protected:
Voxel2Vector v2v;
vector<Operation> data;
std::vector<Operation> data;
};

void run() {
Expand Down

0 comments on commit b1767b7

Please sign in to comment.