From bbc7ebfad99a89806ed0800d489132719c3b54c2 Mon Sep 17 00:00:00 2001
From: Haohua-Lyu <haohua@berkeley.edu>
Date: Wed, 20 Apr 2022 01:36:33 -0700
Subject: [PATCH] Compute lambda_shot and lambda_read

---
 src/merge.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/merge.cpp b/src/merge.cpp
index 8cd71c4..81f3942 100644
--- 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;
     std::tie(lambda_shot, lambda_read) = merge::getNoiseParams(ISO, white_level, black_level);