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

2015-12-13 23:08:02 -05:00
parent 7467dd42ad
commit 7e9529e4cc
1 changed files with 0 additions and 6 deletions
@@ -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)
  {