From b41f2e9f0f2bb0a047521116838825ec1589d7bf Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Thu, 23 Mar 2017 21:19:12 +0100
Subject: [PATCH] correct some merge error

---
 src/multi_array.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/multi_array.h b/src/multi_array.h
index 1435959..ee2dada 100644
--- a/src/multi_array.h
+++ b/src/multi_array.h
@@ -192,12 +192,6 @@ namespace MultiArrayTools
 	template <class NameType>
 	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>