From ad90acb8fc842e95b99adbcc080de1d27c019d17 Mon Sep 17 00:00:00 2001
From: Marcus Edel <marcus.edel@fu-berlin.de>
Date: Sat, 9 Jun 2018 01:02:58 +0200
Subject: [PATCH] Fix minor style issues (remove blank line, add line at the
 end of the file).

---
 src/mlpack/methods/ann/layer/multiply_merge_impl.hpp | 1 -
 src/mlpack/tests/ann_layer_test.cpp                  | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mlpack/methods/ann/layer/multiply_merge_impl.hpp b/src/mlpack/methods/ann/layer/multiply_merge_impl.hpp
index 70660f60ad..19d670d113 100644
--- a/src/mlpack/methods/ann/layer/multiply_merge_impl.hpp
+++ b/src/mlpack/methods/ann/layer/multiply_merge_impl.hpp
@@ -72,7 +72,6 @@ template<typename eT>
 void MultiplyMerge<InputDataType, OutputDataType, CustomLayers...>::Backward(
     const arma::Mat<eT>&& /* input */, arma::Mat<eT>&& gy, arma::Mat<eT>&& g)
 {
-
   if (run)
   {
     for (size_t i = 0; i < network.size(); ++i)
diff --git a/src/mlpack/tests/ann_layer_test.cpp b/src/mlpack/tests/ann_layer_test.cpp
index aede1b38c6..0d86ad48cd 100644
--- a/src/mlpack/tests/ann_layer_test.cpp
+++ b/src/mlpack/tests/ann_layer_test.cpp
@@ -869,7 +869,7 @@ BOOST_AUTO_TEST_CASE(SimpleAddMergeLayerTest)
 
   for (size_t i = 0; i < 5; ++i)
   {
-    AddMerge<> module;
+    AddMerge<> module(false, false);
     const size_t numMergeModules = math::RandInt(2, 10);
     for (size_t m = 0; m < numMergeModules; ++m)
     {
@@ -1617,7 +1617,7 @@ BOOST_AUTO_TEST_CASE(SimpleMultiplyMergeLayerTest)
 
   for (size_t i = 0; i < 5; ++i)
   {
-    MultiplyMerge<> module;
+    MultiplyMerge<> module(false, false);
     const size_t numMergeModules = math::RandInt(2, 10);
     for (size_t m = 0; m < numMergeModules; ++m)
     {
@@ -1862,4 +1862,4 @@ BOOST_AUTO_TEST_CASE(MultiplyMergeRunTest)
   BOOST_REQUIRE_EQUAL(arma::accu(delta), 0);
 }
 
-BOOST_AUTO_TEST_SUITE_END();
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END();