From a0f747be9349e7954a0116b362772403d88219b3 Mon Sep 17 00:00:00 2001 From: Matt Argao Date: Thu, 8 Nov 2012 17:16:39 -0500 Subject: Merge fix --- mode_match.m | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mode_match.m b/mode_match.m index 27affcb..c08ccd6 100644 --- a/mode_match.m +++ b/mode_match.m @@ -45,10 +45,6 @@ n=4; possible_lens_placement_trunc = round(possible_lens_placement*10^n)./10^n; [possible_lens_placement_uniq, index] = unique(possible_lens_placement_trunc,'rows','stable'); %Unique solutions only -<<<<<<< HEAD -n_possible_lens_placement = min(5,size(possible_lens_placement_uniq,1)); -======= pick_of_n_best_lens_placements = min(5,size(possible_lens_placement_uniq,1)); ->>>>>>> exper end -- cgit v1.2.3