[mlpack-git] master: Fix failed merge. (7e6fe3f)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Fri Oct 2 20:54:26 EDT 2015


Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/de88672879a1893ebfc131538c64e7755251337c...7e6fe3f1c25445dfd41c747839aa1fbf1c31a776

>---------------------------------------------------------------

commit 7e6fe3f1c25445dfd41c747839aa1fbf1c31a776
Author: Ryan Curtin <ryan at ratml.org>
Date:   Sat Oct 3 00:54:15 2015 +0000

    Fix failed merge.


>---------------------------------------------------------------

7e6fe3f1c25445dfd41c747839aa1fbf1c31a776
 src/mlpack/tests/serialization_test.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mlpack/tests/serialization_test.cpp b/src/mlpack/tests/serialization_test.cpp
index 316bdf6..8a92130 100644
--- a/src/mlpack/tests/serialization_test.cpp
+++ b/src/mlpack/tests/serialization_test.cpp
@@ -1035,5 +1035,6 @@ BOOST_AUTO_TEST_CASE(DETTest)
       }
     }
   }
+}
 
 BOOST_AUTO_TEST_SUITE_END();



More information about the mlpack-git mailing list