Resolved README merge conflict

1 files changed, 23 insertions, 23 deletions

diff --git a/cxx11/c++11-test-variadic_templates-N2555.cpp b/cxx11/c++11-test-variadic_templates-N2555.cpp
index 79fae84..4518e88 100644
--- a/cxx11/c++11-test-variadic_templates-N2555.cpp
+++ b/cxx11/c++11-test-variadic_templates-N2555.cpp
@@ -1,23 +1,23 @@
-int Accumulate()

-{

-	return 0;

-}

-

-template<typename T, typename... Ts>

-int Accumulate(T v, Ts... vs)

-{

-	return v + Accumulate(vs...);

-}

-

-template<int... Is>

-int CountElements()

-{

-	return sizeof...(Is);

-}

-

-int main()

-{

-	int acc = Accumulate(1, 2, 3, 4, -5);

-	int count = CountElements<1,2,3,4,5>();

-	return ((acc == 5) && (count == 5)) ? 0 : 1;

-}

+int Accumulate()
+{
+	return 0;
+}
+
+template<typename T, typename... Ts>
+int Accumulate(T v, Ts... vs)
+{
+	return v + Accumulate(vs...);
+}
+
+template<int... Is>
+int CountElements()
+{
+	return sizeof...(Is);
+}
+
+int main()
+{
+	int acc = Accumulate(1, 2, 3, 4, -5);
+	int count = CountElements<1,2,3,4,5>();
+	return ((acc == 5) && (count == 5)) ? 0 : 1;
+}