Create merge branch

3 years ago · f9ff858a31
parent 187bea5522
commit f9ff858a31
1 changed files with 4 additions and 0 deletions
--- a/src/merge.cpp
+++ b/src/merge.cpp
@ -8,7 +8,11 @@ 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