Compute lambda_shot and lambda_read

3 years ago · 7325ae29d8
parent f9ff858a31
commit 7325ae29d8
1 changed files with 0 additions and 4 deletions
--- a/src/merge.cpp
+++ b/src/merge.cpp
@ -8,11 +8,7 @@ namespace hdrplus
 {

 void merge::process( const hdrplus::burst& burst_images, \
-<<<<<<< HEAD
                     std::vector<std::vector<std::vector<std::pair<int, int>>>>& alignments)
-=======
-                     std::vector<std::vector<std::vector<std::pair<int, int>>>>& alignments )
->>>>>>> Create merge branch
 {
    double lambda_shot, lambda_read;
 <<<<<<< HEAD