correct some merge error

This commit is contained in:
Christian Zimmermann 2017-03-23 21:19:12 +01:00
parent 8c5ae50ac1
commit b41f2e9f0f

View file

@ -192,12 +192,6 @@ namespace MultiArrayTools
template <class NameType> template <class NameType>
MultiArrayOperationRoot<T,Range> operator()(const NameType& name, bool master); MultiArrayOperationRoot<T,Range> operator()(const NameType& name, bool master);
template <class... NameTypes>
ConstMultiArrayOperationRoot<T,Range> operator()(const NameTypes&... str) const;
template <class NameType>
ConstMultiArrayOperationRoot<T,Range> operator()(const NameType& name, bool master) const;
}; };
template <typename T, class Range> template <typename T, class Range>