From aad2be1de740051c70cee447c531416f937dd1fb Mon Sep 17 00:00:00 2001
From: John Wellbelove <github@wellbelove.co.uk>
Date: Sat, 27 Apr 2019 16:30:45 +0100
Subject: [PATCH] Merge branch 'development'

# Conflicts:
#	include/etl/multi_array.h
---
 include/etl/multi_array.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/etl/multi_array.h b/include/etl/multi_array.h
index a92c9f6a..0c1f9f06 100644
--- a/include/etl/multi_array.h
+++ b/include/etl/multi_array.h
@@ -59,8 +59,8 @@ namespace etl
     };
   }
 
-  template <typename T, const size_t D1, const size_t... Dx>
-  using multi_array = typename private_multi_array::multi_array_t<T, D1, Dx...>::type;
+  template <typename T, const size_t... Dx>
+  using multi_array = typename private_multi_array::multi_array_t<T, Dx...>::type;
 
 #endif
 }