[mlpack-git] master: Okay, so it turns out I'm not very good at git merge. (7e9529e)

[gitdub at big.cc.gt.atl.ga.us]

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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/7467dd42adfc64b8c7e4107f361c3245728e99e5...714d6b7829b76fd8348b894a5eb5996a5380ba2a

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

commit 7e9529e4cc94939bd535efbf4eba3a4844b4154e
Author: Ryan Curtin <ryan at ratml.org>
Date:   Sun Dec 13 23:08:02 2015 -0500

    Okay, so it turns out I'm not very good at git merge.


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

7e9529e4cc94939bd535efbf4eba3a4844b4154e
 src/mlpack/methods/rann/ra_model_impl.hpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/mlpack/methods/rann/ra_model_impl.hpp b/src/mlpack/methods/rann/ra_model_impl.hpp
index d7a27cb..390de09 100644
--- a/src/mlpack/methods/rann/ra_model_impl.hpp
+++ b/src/mlpack/methods/rann/ra_model_impl.hpp
@@ -453,10 +453,7 @@ void RAModel<SortPolicy>::Search(arma::mat&& querySet,
     Log::Info << "single-tree rank-approximate " << TreeName() << " search...";
   else
     Log::Info << "brute-force (naive) rank-approximate search...";
-<<<<<<< HEAD
-=======
   Log::Info << std::endl;
->>>>>>> f535c29999c3d57b06664cceb871b5c937666586
 
   switch (treeType)
   {
@@ -518,10 +515,7 @@ void RAModel<SortPolicy>::Search(const size_t k,
     Log::Info << "single-tree rank-approximate " << TreeName() << " search...";
   else
     Log::Info << "brute-force (naive) rank-approximate search...";
-<<<<<<< HEAD
-=======
   Log::Info << std::endl;
->>>>>>> f535c29999c3d57b06664cceb871b5c937666586
 
   switch (treeType)
   {